DF-3527 material/shader cleanup