Another NEW parts clean out

I'll take #10 and #17.