Updated subjects, fixed missing materials (and removed extra materials)
Merge branch 'prod'

* prod:
  Updated subjects, fixed missing materials (and removed extra materials)