Remove some more unused shader variables