Remove some unnecessary code
Make all the materials case objects