diff --git a/layers/boundary/mapping.yaml b/layers/boundary/mapping.yaml
index a5e70348..81b0a89b 100644
--- a/layers/boundary/mapping.yaml
+++ b/layers/boundary/mapping.yaml
@@ -37,13 +37,10 @@ tables:
       name: admin_level
       type: integer
     filters:
-      #exclude_tags:
-      #- [ "admin_level", "__nil__" ]
-      #- [ "natural", "coastline" ]
       reject:
         natural:  ["coastline"]
       require:
-        admin_level: ["__any__"]  
+        admin_level: ["__any__"]
     mapping:
       boundary:
       - administrative
diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
index fff292fa..6e42b65c 100644
--- a/layers/place/mapping.yaml
+++ b/layers/place/mapping.yaml
@@ -56,10 +56,8 @@ tables:
     - *name
     - *name_en
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - continent
@@ -84,10 +82,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - country
@@ -114,10 +110,8 @@ tables:
     - *name_ja
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - island
@@ -142,8 +136,6 @@ tables:
     - *name_ja
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
         name: ["__any__"]
     mapping:
@@ -179,10 +171,8 @@ tables:
       type: string
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
-        name: ["__any__"]      
+        name: ["__any__"]
     mapping:
       place:
       - state
@@ -216,8 +206,6 @@ tables:
       type: string
     - *rank
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
         name: ["__any__"]
     mapping:
diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index c7c6d8e6..b0bf580c 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -57,8 +57,6 @@ tables:
       key: waterway
       type: string
     filters:
-      #exclude_tags:
-      #- [ "covered", "yes" ]
       reject:
         covered: ["yes"]
     mapping:
diff --git a/layers/water_name/mapping.yaml b/layers/water_name/mapping.yaml
index 14a3ea7f..fbeaf391 100644
--- a/layers/water_name/mapping.yaml
+++ b/layers/water_name/mapping.yaml
@@ -17,8 +17,6 @@ tables:
       key: place
       type: string
     filters:
-      #exclude_tags:
-      #- [ "name", "__nil__" ]
       require:
         name: ["__any__"]
     mapping: