Cleaned up parts and materials