diff --git a/data/classificator.txt b/data/classificator.txt
index 283078d5cb..4cdaf1ba1a 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -640,22 +640,6 @@ world  +
         ngo  -
         telecommunication  -
         {}
-    olympics  +
-        attraction  -
-        bike_sport  -
-        live_site  -
-        official_building  -
-        stadium  -
-        stadium_main  -
-        transport_airport  -
-        transport_boat  -
-        transport_bus  -
-        transport_cable  -
-        transport_railway  -
-        transport_subway  -
-        transport_tram  -
-        water_sport  -
-        {}
     piste:lift  +
         j-bar  -
         magic_carpet  -
diff --git a/data/types.txt b/data/types.txt
index 61a52cb772..d1c145b3d0 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1122,20 +1122,20 @@ mapswithme
 *wheelchair|no
 *wheelchair|limited
 *building|has_parts
-*olympics|transport_airport
-*olympics|transport_railway
-*olympics|transport_boat
-*olympics|transport_bus
-*olympics|transport_tram
-*olympics|transport_cable
-*olympics|transport_subway
-*olympics|official_building
-*olympics|attraction
-*olympics|live_site
-*olympics|stadium_main
-*olympics|stadium
-*olympics|water_sport
-*olympics|bike_sport
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+mapswithme
 *sponsored|opentable
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index af2a139eaa..ed19aba007 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -640,22 +640,6 @@ world  00000000000000000000  +
         ngo  00000000000000000000  -
         telecommunication  00000000000000000000  -
         {}
-    olympics  00000000000000000000  +
-        attraction  00000000000000000000  -
-        bike_sport  00000000000000000000  -
-        live_site  00000000000000000000  -
-        official_building  00000000000000000000  -
-        stadium  00000000000000000000  -
-        stadium_main  00000000000000000000  -
-        transport_airport  00000000000000000000  -
-        transport_boat  00000000000000000000  -
-        transport_bus  00000000000000000000  -
-        transport_cable  00000000000000000000  -
-        transport_railway  00000000000000000000  -
-        transport_subway  00000000000000000000  -
-        transport_tram  00000000000000000000  -
-        water_sport  00000000000000000000  -
-        {}
     piste:lift  00000000000000000000  +
         j-bar  00000000000000000000  -
         magic_carpet  00000000000000000000  -