diff --git a/indexes.sql b/indexes.sql
index 54bb376e80..8b07450d13 100644
--- a/indexes.sql
+++ b/indexes.sql
@@ -7,7 +7,7 @@ CREATE INDEX planet_osm_roads_admin
   WHERE boundary = 'administrative';
 CREATE INDEX planet_osm_roads_roads_ref
   ON planet_osm_roads USING GIST (way)
-  WHERE WHERE highway IS NOT NULL AND ref IS NOT NULL;
+  WHERE highway IS NOT NULL AND ref IS NOT NULL;
 CREATE INDEX planet_osm_roads_admin_low
   ON planet_osm_roads USING GIST (way)
   WHERE boundary = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4');
@@ -29,9 +29,6 @@ CREATE INDEX planet_osm_polygon_nobuilding
 CREATE INDEX planet_osm_polygon_name
   ON planet_osm_polygon USING GIST (way)
   WHERE name IS NOT NULL;
-CREATE INDEX planet_osm_point_place_low
-  ON planet_osm_point USING GIST (way)
-  WHERE place IN ('city', 'town') AND name IS NOT NULL;
 CREATE INDEX planet_osm_point_place
   ON planet_osm_point USING GIST (way)
   WHERE place IS NOT NULL AND name IS NOT NULL;
diff --git a/indexes.yml b/indexes.yml
index 711744eb16..3539d7e3ee 100644
--- a/indexes.yml
+++ b/indexes.yml
@@ -4,8 +4,6 @@
 
 point:
   # The point table is small, but so are the partial indexes
-  place_low:
-    where: place IN ('city', 'town') AND name IS NOT NULL
   place:
     where: place IS NOT NULL AND name IS NOT NULL
 line:
@@ -31,4 +29,4 @@ roads:
   admin:
     where: boundary = 'administrative'
   roads_ref:
-    where: WHERE highway IS NOT NULL AND ref IS NOT NULL
+    where: highway IS NOT NULL AND ref IS NOT NULL