More shader cleanups