diff --git a/data/classificator.txt b/data/classificator.txt
index 4e7fcb61c8..9945c4c8f0 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -696,11 +696,7 @@ world  +
         village  -
         {}
     power  +
-        generator  +
-            hydro  -
-            photovoltaic  -
-            wind  -
-            {}
+        generator  -
         line  +
             underground  -
             {}
diff --git a/data/types.txt b/data/types.txt
index e153ecf0ab..ba7ef2ef2a 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -124,7 +124,7 @@ waterway|stream|tunnel
 tourism|information|guidepost
 amenity|parking|fee
 amenity|kindergarten
-power|generator|wind
+mapswithme
 place|suburb
 landuse|allotments
 landuse|forest|coniferous
@@ -330,7 +330,7 @@ sport|football
 highway|steps|bridge
 highway|track|tunnel
 highway|pedestrian|tunnel
-power|generator|hydro
+mapswithme
 sport|cricket
 sport|bowls
 highway|path|tunnel
@@ -373,7 +373,7 @@ mapswithme
 landuse|greenhouse_horticulture
 mapswithme
 amenity|bureau_de_change
-power|generator|photovoltaic
+mapswithme
 mapswithme
 highway|bridleway|bridge
 highway|service|driveway
diff --git a/data/visibility.txt b/data/visibility.txt
index 5eed4e9bc2..50fce745f9 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -696,11 +696,7 @@ world  00000000000000000000  +
         village  00000000000111111111  -
         {}
     power  00000000000000000000  +
-        generator  00000000000000000000  +
-            hydro  00000000000000000000  -
-            photovoltaic  00000000000000000000  -
-            wind  00000000000000000000  -
-            {}
+        generator  00000000000000000000  -
         line  00000000000000000000  +
             underground  00000000000000000000  -
             {}