Newest Small Parts Clean Out

#3 and #16, please!