diff --git a/plugins/input/shape/shape_featureset.cpp b/plugins/input/shape/shape_featureset.cpp
index 9b2c38800..ce862a81d 100644
--- a/plugins/input/shape/shape_featureset.cpp
+++ b/plugins/input/shape/shape_featureset.cpp
@@ -88,11 +88,7 @@ feature_ptr shape_featureset<filterT>::next()
             double y = record.read_double();
             if (!filter_.pass(mapnik::box2d<double>(x,y,x,y)))
                 continue;
-            //std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
-            //point->move_to(x, y);
-            //feature->paths().push_back(point.release());
-            mapnik::new_geometry::point pt(x, y);
-            feature->set_geometry(std::move(pt));
+            feature->set_geometry(mapnik::new_geometry::point(x,y));
             break;
         }
         case shape_io::shape_multipoint:
@@ -107,8 +103,7 @@ feature_ptr shape_featureset<filterT>::next()
             {
                 double x = record.read_double();
                 double y = record.read_double();
-                mapnik::new_geometry::point point(x, y);
-                multi_point.push_back(std::move(point));
+                multi_point.emplace_back(mapnik::new_geometry::point(x, y));
             }
             feature->set_geometry(std::move(multi_point));
             break;
diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp
index 87a7b2d50..8702686cf 100644
--- a/plugins/input/shape/shape_index_featureset.cpp
+++ b/plugins/input/shape/shape_index_featureset.cpp
@@ -104,11 +104,7 @@ feature_ptr shape_index_featureset<filterT>::next()
         {
             double x = record.read_double();
             double y = record.read_double();
-            mapnik::new_geometry::point point(x, y);
-            //std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
-            //point->move_to(x, y);
-            //feature->paths().push_back(point.release());
-            feature->set_geometry(std::move(point));
+            feature->set_geometry(mapnik::new_geometry::point(x,y));
             break;
         }
         case shape_io::shape_multipoint:
@@ -123,11 +119,7 @@ feature_ptr shape_index_featureset<filterT>::next()
             {
                 double x = record.read_double();
                 double y = record.read_double();
-                mapnik::new_geometry::point point(x, y);
-                //std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
-                //point->move_to(x, y);
-                //feature->paths().push_back(point.release());
-                multi_point.emplace_back(point);
+                multi_point.emplace_back(mapnik::new_geometry::point(x, y));
             }
             feature->set_geometry(std::move(multi_point));
             break;
diff --git a/plugins/input/shape/shape_io.cpp b/plugins/input/shape/shape_io.cpp
index db7ff863e..eb6c73903 100644
--- a/plugins/input/shape/shape_io.cpp
+++ b/plugins/input/shape/shape_io.cpp
@@ -204,7 +204,6 @@ mapnik::new_geometry::geometry shape_io::read_polygon(shape_file::record_type &
     }
     if (multi_poly.size() > 0)
     {
-        std::cerr << "multi_polygon" << std::endl;
         return std::move(mapnik::new_geometry::geometry(std::move(multi_poly)));
     }
     return std::move(mapnik::new_geometry::geometry(std::move(poly)));