shader cleanups