Added cleanup for shader-manager
Big commit before I riun everything