Another NEW parts clean out

Sending PM on #5