AutoParts fixes
Cleanups