This is something that I will clean up once we have cleaned up the material type structure.