diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index afb3d1f76..8250b4275 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -45,7 +45,6 @@ public:
     // Triggers a lazy rerender: only performs a render when the map is not clean.
     void rerender();
 
-    void renderLayers(std::shared_ptr<StyleLayerGroup> group);
     enum RenderPass { Opaque, Translucent };
 
     void renderLayer(std::shared_ptr<StyleLayer> layer_desc, RenderPass pass, const Tile::ID* id = nullptr, const mat4* matrix = nullptr);
@@ -154,6 +153,7 @@ private:
 
     // Unconditionally performs a render with the current map state.
     void render();
+    void renderLayers(std::shared_ptr<StyleLayerGroup> group);
 
 private:
     bool async = false;
@@ -178,10 +178,10 @@ private:
 
 public:
     View &view;
-    TransformState state;
 
 private:
     Transform transform;
+    TransformState state;
 
     std::shared_ptr<FileSource> fileSource;
 
diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp
index 80948c49b..710e6134b 100644
--- a/include/mbgl/renderer/painter.hpp
+++ b/include/mbgl/renderer/painter.hpp
@@ -129,7 +129,6 @@ public:
     void depthMask(bool value);
 
 public:
-//    mat4 matrix;
     mat4 vtxMatrix;
     mat4 projMatrix;
     mat4 nativeMatrix;
diff --git a/src/map/tile_parser.cpp b/src/map/tile_parser.cpp
index 7c3b720f6..6069ad82c 100644
--- a/src/map/tile_parser.cpp
+++ b/src/map/tile_parser.cpp
@@ -101,8 +101,8 @@ std::unique_ptr<Bucket> TileParser::createBucket(std::shared_ptr<StyleBucket> bu
     if (tile.id.z >= std::ceil(bucket_desc->max_zoom)) return nullptr;
 
     auto layer_it = vector_data.layers.find(bucket_desc->source_layer);
-    const VectorTileLayer &layer = layer_it->second;
     if (layer_it != vector_data.layers.end()) {
+        const VectorTileLayer &layer = layer_it->second;
         if (bucket_desc->render.is<StyleBucketFill>()) {
             return createFillBucket(layer, bucket_desc->filter, bucket_desc->render.get<StyleBucketFill>());
         } else if (bucket_desc->render.is<StyleBucketLine>()) {
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index dc75b0abc..e2da2d0e5 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -164,8 +164,6 @@ void Painter::setStrata(float value) {
 }
 
 void Painter::prepareTile(const Tile& tile) {
-//    matrix = tile.matrix;
-
     GLint id = (GLint)tile.clip.mask.to_ulong();
     GLuint mask = clipMask[tile.clip.length];
     glStencilFunc(GL_EQUAL, id, mask);
diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
index 33a1573c0..dd4db5d73 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -496,11 +496,6 @@ std::shared_ptr<StyleLayer> StyleParser::createLayer(JSVal value) {
             layer_id, std::move(styles));
 
         if (value.HasMember("layers")) {
-            if (value.HasMember("type")) {
-                JSVal type = value["type"];
-                if (std::string { type.GetString(), type.GetStringLength() } == "raster") {
-                }
-            }
             layer->layers = createLayers(value["layers"]);
         }