Various Material clean up