Misc small parts clean out

Still available!