diff --git a/src/Picture/Preload.hs b/src/Picture/Preload.hs
index 3509ac55f..42773e092 100644
--- a/src/Picture/Preload.hs
+++ b/src/Picture/Preload.hs
@@ -107,8 +107,6 @@ preloadRender = do
     return $ RenderData
         { _textures = [dirttex,dirttex]
         , _listShaders = [bslist,lslist,cslist,aslist,eslist]
---        , _lightmapCircleShader = fcs
-        , _backVAO = backgroundvao
         , _dummyVBO = dummyvbo
         , _dummyPtr = dummyptr
         , _lightSourceShader = lsShad
@@ -121,9 +119,8 @@ vaoPointers = (\(_,ps,_) -> ps) . unzip3 . _vaoBufferTargets
 
 cleanUpRenderPreload :: RenderData -> IO ()
 cleanUpRenderPreload pd = do
---    mapM_ free $ vaoPointers $ _triVAO  pd
---    mapM_ free $ vaoPointers $ _textVAO pd
---    mapM_ free $ vaoPointers $ _circVAO pd
---    mapM_ free $ vaoPointers $ _arcVAO  pd
---    mapM_ free $ vaoPointers $ _lineVAO pd
+    mapM_ freeShaderPointers $ _listShaders pd
+    freeShaderPointers $ _lightSourceShader pd
+    freeShaderPointers $ _wallShadowShader pd
+    freeShaderPointers $ _backgroundShader pd
     free $ _dummyPtr pd
diff --git a/src/Picture/Render.hs b/src/Picture/Render.hs
index b3a29c545..619bd1f3b 100644
--- a/src/Picture/Render.hs
+++ b/src/Picture/Render.hs
@@ -11,11 +11,6 @@ import Shader
 import Control.Lens
 import Control.Monad
 
-import qualified Control.Applicative as Ap
-
-import Linear.Matrix
-import Linear.V4
-
 import qualified Control.Foldl as F
 
 import Data.Bifunctor
@@ -28,22 +23,13 @@ import Picture.Preload
 
 import Foreign hiding (rotate)
 
-import Codec.Picture
-
-import Graphics.GL.Core43
-
 import Graphics.Rendering.OpenGL hiding (Line,translate,scale,imageHeight,imageWidth,Polygon,Color,T)
-import qualified Graphics.Rendering.OpenGL as GL
 
 import Data.Foldable
 import Data.List
 import Data.Maybe (fromJust)
 
---import qualified Data.Vector.Storable as V
-import qualified Data.IntMap as IM
---import qualified Data.DList as DL
-
---import Control.DeepSeq
+import qualified Data.IntMap.Strict as IM
 
 import qualified SDL as SDL