Moved shaders, cleanup