Misc Small Parts Clean Out

Next for #4 if it falls thru Al.