Misc Small Parts clean out

Next in line for #17...