Another Small Parts Clean Out

I'll take #25 please