diff --git a/data/categories.txt b/data/categories.txt
index 2f40beb094..b1339e5b0b 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -9203,11 +9203,3 @@ el:^Χριστούγεννα ή Ρεβεγιόν πρωτοχρονιάς
sponsored-partner2
en:^Luggage Storage|Luggage Hero|3luggagehero
-
-event-fc2018
-en:3^Football Cup 2018|2FIFA|championship|fc2018
-ru:2^ЧМ 2018 по футболу|1ФИФА|футбол|кубок
-
-event-fc2018_city
-en:^Football City 2018
-ru:^Город ЧМ 2018 по футболу
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 6c4bdc7f9d..bba9c60f08 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1205,8 +1205,8 @@ sponsored|partner2;1204;
sponsored|partner3;1205;
sponsored|partner4;1206;
sponsored|partner5;1207;
-event|fc2018;1208;
-event|fc2018_city;1209;
+event|fc2018;1208;x
+event|fc2018_city;1209;x
shop|money_lender;1210;
sponsored|partner6;1211;
sponsored|partner7;1212;
diff --git a/data/mixed_nodes.txt b/data/mixed_nodes.txt
index db59ec493a..af84095989 100644
--- a/data/mixed_nodes.txt
+++ b/data/mixed_nodes.txt
@@ -1,141 +1,3 @@
-# FC 2018
-
-lat=54.1817
-lon=45.2037
-leisure=stadium
-event=fc2018
-name=Мордовия Арена
-name:ru=Мордовия Арена
-name:en=Mordovia Arena
-name:de=Mordwinien-Arena
-name:fr=Stade de Mordovie
-name:es=Mordovia Arena
-
-lat=54.6981
-lon=20.5338
-leisure=stadium
-event=fc2018
-name=Стадион Калининград
-name:ru=Стадион Калининград
-name:en=Kaliningrad Stadium
-name:de=Kaliningrad-Stadion
-name:fr=Stade de Kaliningrad
-name:es=Estadio de Kaliningrado
-
-
-lat=55.76019
-lon=37.62489
-event=fc2018
-shop=gift
-name=Атрибутика ЧМ 2018
-name:en=FC 2018 Gift Shop
-
-lat=59.93409
-lon=30.33282
-event=fc2018
-shop=gift
-name=Атрибутика ЧМ 2018
-name:en=FC 2018 Gift Shop
-
-lat=59.93006
-lon=30.3621
-event=fc2018
-shop=gift
-name=Атрибутика ЧМ 2018
-name:en=FC 2018 Gift Shop
-
-
-# FanFest
-
-lat=48.70366
-lon=44.52186
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=47.22695
-lon=39.74555
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=55.81196
-lon=49.10735
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=53.19569
-lon=50.10094
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=54.71047
-lon=20.51299
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=43.57941
-lon=39.71896
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=54.18079
-lon=45.18690
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=55.70430
-lon=37.53320
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=59.94106
-lon=30.32631
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=56.81616
-lon=60.64535
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-lat=56.32772
-lon=44.00715
-olympics=live_site
-event=fc2018
-name:en=FanFest
-name=Фан-зона
-
-
-# Adidas Temporary Store
-
-lat=55.73654
-lon=37.59405
-shop=sports
-name=Adidas
-sponsored=partner4
-event=fc2018
-banner_url=http://www.adidas.ru
-
-
# Luggage Hero
lat=40.7051423
diff --git a/data/mixed_tags.txt b/data/mixed_tags.txt
index cd375a4e40..e06c0e6531 100644
--- a/data/mixed_tags.txt
+++ b/data/mixed_tags.txt
@@ -2,85 +2,6 @@
# Format: type,id,key1=value1,key2=value2,...
# Example: way,34306743,olympics=stadium
-# FC2018: city, stadium, other amenities
-
-# Moscow
-node,1686293227,event=fc2018,event=fc2018_city
-relation,162802,event=fc2018,name:ru=Стадион Лужники,int_name=Stadion Luzniki,name:en=Luzhniki Stadium,name:de=Luzhniki-Stadion,name:fr=Stade Loujniki,name:es=Estadio Luzhniki
-relation,4006864,event=fc2018,name:ru=Открытие Арена / Стадион Спартак,int_name=Otkrytie Arena / Stadion Spartac,name:en=Spartak Stadium,name:de=Spartak-Stadion,name:fr=Stade du Spartak,name:es=Estadio Spartak
-node,5518180725,event=fc2018
-node,5614227995,event=fc2018
-node,5602026526,event=fc2018
-node,5202107560,event=fc2018,olympics=transport_bus
-node,4379061181,event=fc2018,olympics=transport_bus
-node,297335182,event=fc2018,olympics=transport_bus
-
-# Saint-Petersburg
-node,27490597,event=fc2018,event=fc2018_city
-way,217387802,event=fc2018,name:ru=Стадион Санкт-Петербург,int_name=Sankt Peterburg Stadion,name:en=Saint Petersburg Stadium,name:de=Sankt-Petersburg-Stadion,name:fr=Stade de Saint-Pétersbourg,name:es=Estadio de San Petersburgo
-node,5510340721,event=fc2018
-node,5602106621,event=fc2018
-node,5602054321,event=fc2018
-node,5614907439,event=fc2018,olympics=transport_bus
-
-# Kazan
-node,27504067,event=fc2018,event=fc2018_city
-relation,3840572,event=fc2018,name:ru=Казань Арена,name:en=Kazan Arena,name:de=Kasan-Arena,name:fr=Kazan Arena,name:es=Kazan Arena
-node,5516316021,event=fc2018
-node,5614238413,event=fc2018
-node,1931215209,event=fc2018,olympics=transport_bus
-
-# Ekaterinburg
-node,27503892,event=fc2018,event=fc2018_city
-relation,55833,event=fc2018,name:ru=Екатеринбург Арена,name:en=Ekaterinburg Arena,name:de=Jekaterinburg-Arena,name:fr=Iekaterinbourg Arena,name:es=Ekaterimburgo Arena
-node,5514737722,event=fc2018
-node,456774510,event=fc2018,olympics=transport_bus
-node,1794063609,event=fc2018,olympics=transport_bus
-
-# Saransk
-node,191651581,event=fc2018,event=fc2018_city
-# under construction,name:ru=Мордовия Арена,name:en=Mordovia Arena,name:de=Mordwinien-Arena,name:fr=Stade de Mordovie,name:es=Mordovia Arena
-node,5510340621,event=fc2018
-
-# Samara
-node,27503945,event=fc2018,event=fc2018_city
-way,572625474,event=fc2018,name:ru=Самара Арена,name:en=Samara Arena,name:de=Samara-Arena,name:fr=Samara Arena,name:es=Samara Arena
-node,5516328322,event=fc2018
-way,585482626,event=fc2018,olympics=transport_bus
-
-# Sochi
-node,34043670,event=fc2018,event=fc2018_city
-relation,3405854,event=fc2018,name:ru=Стадион Фишт,name:en=Fisht Stadium,name:de=Fischt-Stadion,name:fr=Stade Ficht,name:es=Estadio Fisht
-node,5510340722,event=fc2018
-node,5614242996,event=fc2018
-node,2195050637,event=fc2018,olympics=transport_bus
-
-# Volgograd
-node,27504363,event=fc2018,event=fc2018_city
-relation,7718662,event=fc2018,name:ru=Волгоград Арена,name:en=Volgograd Arena,name:de=Wolgograd-Arena,name:fr=Volgograd Arena,name:es=Volgogrado Arena
-node,5516328122,event=fc2018
-node,5505648416,event=fc2018,olympics=transport_bus
-
-# Rostov-on-Don
-node,160569651,event=fc2018,event=fc2018_city
-way,137831707,event=fc2018,name:ru=Ростов Арена,name:en=Rostov Arena,name:de=Rostow-Arena,name:fr=Rostov Arena,name:es=Rostov Arena
-node,5516316121,event=fc2018
-node,5602066021,event=fc2018
-node,4743644020,event=fc2018,olympics=transport_bus
-node,4743644018,event=fc2018,olympics=transport_bus
-
-# Kaliningrad
-node,27048976,event=fc2018,event=fc2018_city
-# under construction,name:ru=Стадион Калининград,name:en=Kaliningrad Stadium,name:de=Kaliningrad-Stadion,name:fr=Stade de Kaliningrad,name:es=Estadio de Kaliningrado
-# node,5514732428,event=fc2018
-node,5602066024,event=fc2018
-
-# Nizhny Novgorod
-node,27505889,event=fc2018,event=fc2018_city
-relation,7718680,event=fc2018,name:ru=Стадион Нижний Новгород,name:en=Nizhny Novgorod Stadium,name:de=Nischni-Nowgorod-Stadion,name:fr=Stade de Nijni-Novgorod,name:es=Estadio de Nizhni Nóvgorod
-node,5514732429,event=fc2018
-node,5602104122,event=fc2018
-
# Adidas
@@ -112,7 +33,7 @@ node,5614185076,sponsored=partner4,banner_url=http://www.adidas.ru
node,5614185080,sponsored=partner6,banner_url=http://www.adidas.ru/originals
node,5614185081,sponsored=partner4,banner_url=http://www.adidas.ru
node,4412830395,sponsored=partner6,banner_url=http://www.adidas.ru/originals
-node,5614216502,sponsored=partner4,event=fc2018,banner_url=http://www.adidas.ru
+node,5614216502,sponsored=partner4,banner_url=http://www.adidas.ru
# Costa Coffee
@@ -565,22 +486,22 @@ node,2385981189,sponsored=partner10,banner_url=https://localads.maps.me/redirect
node,4547834618,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
node,5643849580,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
-node,5643698784,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,5643698791,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,1966643409,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-way,46913679,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-way,352852107,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-way,49437015,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,5404100729,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,2747713074,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,3651057153,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,1314992093,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,5149427896,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,3772956357,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,2420686038,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,1502822096,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,3713955240,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
-node,3395051436,sponsored=partner10,event=fc2018,banner_url=https://localads.maps.me/redirects/sportmaster
+node,5643698784,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,5643698791,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,1966643409,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+way,46913679,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+way,352852107,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+way,49437015,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,5404100729,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,2747713074,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,3651057153,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,1314992093,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,5149427896,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,3772956357,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,2420686038,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,1502822096,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,3713955240,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
+node,3395051436,sponsored=partner10,banner_url=https://localads.maps.me/redirects/sportmaster
# Burger King
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 32e85c2727..77cdfa412e 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -648,10 +648,6 @@ node[railway=subway_entrance],
node[railway=station][transport=subway]
{z-index: 3000;}
-node[event=fc2018],
-area[event=fc2018]
-{z-index: 3200;}
-
/* 2. NATURAL */
node|z10-[natural=volcano],
@@ -2825,118 +2821,3 @@ area|z15-[sponsored=partner20]
/* /%PartnersExtender.PartnerConfig */
/* End of autogenerated code. */
-
-/* Fifa */
-
-node|z13-[event=fc2018],
-area|z13-[event=fc2018]
-{font-size: 10;text: name;text-color: @poi_label;text-offset: 1;}
-
-node|z13-14[event=fc2018][leisure=stadium],
-area|z13-14[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 16;}
-
-node|z15-16[event=fc2018][leisure=stadium],
-area|z15-16[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 12;}
-
-node|z17-[event=fc2018][leisure=stadium],
-area|z17-[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 10;text-optional: true;}
-
-node|z15-[event=fc2018][shop=ticket],
-area|z15-[event=fc2018][shop=ticket],
-node|z15-[event=fc2018][olympics=official_building],
-area|z15-[event=fc2018][olympics=official_building],
-{icon-image: wfc_ticket.svg;icon-min-distance: 10;}
-
-node|z15-[event=fc2018][olympics=live_site],
-area|z15-[event=fc2018][olympics=live_site]
-{icon-image: wfc_fanzone.svg;icon-min-distance: 10;}
-
-node|z15-[event=fc2018][shop=gift],
-area|z15-[event=fc2018][shop=gift]
-{icon-image: wfc_shop.svg;icon-min-distance: 10;}
-
-/* Subway Station */
-
-node|z13[event=fc2018][railway=station]
-{icon-image: wfc_subway-s.svg;}
-node|z14[event=fc2018][railway=station]
-{icon-image: wfc_subway-s.svg;}
-node|z15[event=fc2018][railway=station]
-{icon-image: wfc_subway-m.svg;}
-node|z16[event=fc2018][railway=station]
-{icon-image: wfc_subway-m.svg;}
-node|z17-[event=fc2018][railway=station]
-{icon-image: wfc_subway-m.svg;}
-
-node|z17-[event=fc2018][railway=subway_entrance]
-{icon-image: subway-entrance-m.svg;}
-
-/* Tram Station */
-
-node|z14[event=fc2018][railway=tram_stop]
-{icon-image: wfc_tram-s.svg;}
-node|z15-16[event=fc2018][railway=tram_stop],
-area|z15-16[event=fc2018][railway=tram_stop]
-{icon-image: wfc_tram-m.svg;}
-node|z17[event=fc2018][railway=tram_stop],
-area|z17[event=fc2018][railway=tram_stop]
-{icon-image: wfc_tram-m.svg;}
-node|z18-[event=fc2018][railway=tram_stop],
-area|z18-[event=fc2018][railway=tram_stop]
-{icon-image: wfc_tram-m.svg;}
-
-/* Train Station */
-
-node|z11[event=fc2018][railway=halt]
-{icon-image: wfc_train-s.svg;icon-min-distance: 10;}
-node|z12[event=fc2018][railway=halt]
-{icon-image: wfc_train-s.svg;text-offset: 1;font-size: 9;}
-node|z13[event=fc2018][railway=halt]
-{icon-image: wfc_train-s.svg;text-offset: 1;font-size: 10;}
-node|z14[event=fc2018][railway=halt]
-{icon-image: wfc_train-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;}
-node|z15[event=fc2018][railway=halt]
-{icon-image: wfc_train-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;}
-node|z16[event=fc2018][railway=halt]
-{icon-image: wfc_train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;}
-node|z17-[event=fc2018][railway=halt]
-{icon-image: wfc_train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;}
-
-/* Bus Station */
-
-node|z12-13[event=fc2018][amenity=bus_station],
-area|z12-13[event=fc2018][amenity=bus_station]
-{icon-image: wfc_bus-s.svg;}
-node|z14[event=fc2018][amenity=bus_station],
-area|z14[event=fc2018][amenity=bus_station]
-{icon-image: wfc_bus-s.svg;}
-node|z15-16[event=fc2018][amenity=bus_station],
-area|z15-16[event=fc2018][amenity=bus_station]
-{icon-image: wfc_bus-m.svg;}
-node|z17[event=fc2018][amenity=bus_station],
-area|z17[event=fc2018][amenity=bus_station]
-{icon-image: wfc_bus-m.svg;}
-node|z18[event=fc2018][amenity=bus_station],
-area|z18[event=fc2018][amenity=bus_station]
-{icon-image: wfc_bus-m.svg;}
-node|z19-[event=fc2018][amenity=bus_station],
-area|z19-[event=fc2018][amenity=bus_station]
-{icon-image: wfc_bus-m.svg;}
-
-
-node|z16[event=fc2018][highway=bus_stop],
-area|z16[event=fc2018][highway=bus_stop]
-{icon-image: wfc_bus-m.svg;}
-node|z17-[event=fc2018][highway=bus_stop],
-area|z17-[event=fc2018][highway=bus_stop],
-node|z18-[event=fc2018][public_transport=station],
-area|z18-[event=fc2018][public_transport=station]
-{icon-image: wfc_bus-m.svg;}
-node|z18-19[event=fc2018][highway=bus_stop]::int_name,
-area|z18-19[event=fc2018][highway=bus_stop]::int_name,
-node|z18-19[event=fc2018][public_transport=station]::int_name,
-area|z18-19[event=fc2018][public_transport=station]::int_name
-{icon-image: wfc_bus-m.svg;}
diff --git a/data/styles/clear/style-clear/6plus/wfc_fanzone.png b/data/styles/clear/style-clear/6plus/wfc_fanzone.png
deleted file mode 100644
index 2d78818c7d..0000000000
Binary files a/data/styles/clear/style-clear/6plus/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/6plus/wfc_shop.png b/data/styles/clear/style-clear/6plus/wfc_shop.png
deleted file mode 100644
index 1d7d89b52a..0000000000
Binary files a/data/styles/clear/style-clear/6plus/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/6plus/wfc_stadium.png b/data/styles/clear/style-clear/6plus/wfc_stadium.png
deleted file mode 100644
index 1dee4d3476..0000000000
Binary files a/data/styles/clear/style-clear/6plus/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/6plus/wfc_ticket.png b/data/styles/clear/style-clear/6plus/wfc_ticket.png
deleted file mode 100644
index 0edf5fddac..0000000000
Binary files a/data/styles/clear/style-clear/6plus/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/wfc_fanzone.png b/data/styles/clear/style-clear/hdpi/wfc_fanzone.png
deleted file mode 100644
index e6d2556db5..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/wfc_shop.png b/data/styles/clear/style-clear/hdpi/wfc_shop.png
deleted file mode 100644
index e07e937b62..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/wfc_stadium.png b/data/styles/clear/style-clear/hdpi/wfc_stadium.png
deleted file mode 100644
index b4ebbc157b..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/wfc_ticket.png b/data/styles/clear/style-clear/hdpi/wfc_ticket.png
deleted file mode 100644
index 2d976d4b2c..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/wfc_fanzone.png b/data/styles/clear/style-clear/mdpi/wfc_fanzone.png
deleted file mode 100644
index 8b8950fbd8..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/wfc_shop.png b/data/styles/clear/style-clear/mdpi/wfc_shop.png
deleted file mode 100644
index bf52aa8d45..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/wfc_stadium.png b/data/styles/clear/style-clear/mdpi/wfc_stadium.png
deleted file mode 100644
index 277e16c97d..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/wfc_ticket.png b/data/styles/clear/style-clear/mdpi/wfc_ticket.png
deleted file mode 100644
index 0dc0cf0a73..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/symbols/wfc_bus-m.svg b/data/styles/clear/style-clear/symbols/wfc_bus-m.svg
deleted file mode 100644
index 3e971f9aed..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_bus-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/wfc_bus-s.svg b/data/styles/clear/style-clear/symbols/wfc_bus-s.svg
deleted file mode 100644
index 1559741aad..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_bus-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/wfc_subway-m.svg b/data/styles/clear/style-clear/symbols/wfc_subway-m.svg
deleted file mode 100644
index e4032b07bb..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_subway-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/wfc_subway-s.svg b/data/styles/clear/style-clear/symbols/wfc_subway-s.svg
deleted file mode 100644
index 7b1e65384f..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_subway-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/wfc_train-m.svg b/data/styles/clear/style-clear/symbols/wfc_train-m.svg
deleted file mode 100644
index dbdcbcbb35..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_train-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/wfc_train-s.svg b/data/styles/clear/style-clear/symbols/wfc_train-s.svg
deleted file mode 100644
index c29bed49ec..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_train-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/wfc_tram-m.svg b/data/styles/clear/style-clear/symbols/wfc_tram-m.svg
deleted file mode 100644
index e1350dfaaf..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_tram-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/wfc_tram-s.svg b/data/styles/clear/style-clear/symbols/wfc_tram-s.svg
deleted file mode 100644
index 1a469b5d54..0000000000
--- a/data/styles/clear/style-clear/symbols/wfc_tram-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/xhdpi/wfc_fanzone.png b/data/styles/clear/style-clear/xhdpi/wfc_fanzone.png
deleted file mode 100644
index da9281a6c3..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/wfc_shop.png b/data/styles/clear/style-clear/xhdpi/wfc_shop.png
deleted file mode 100644
index fe5088eb23..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/wfc_stadium.png b/data/styles/clear/style-clear/xhdpi/wfc_stadium.png
deleted file mode 100644
index 8b86338049..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/wfc_ticket.png b/data/styles/clear/style-clear/xhdpi/wfc_ticket.png
deleted file mode 100644
index 38863afbe3..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/wfc_fanzone.png b/data/styles/clear/style-clear/xxhdpi/wfc_fanzone.png
deleted file mode 100644
index 98d4ee5563..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/wfc_shop.png b/data/styles/clear/style-clear/xxhdpi/wfc_shop.png
deleted file mode 100644
index 383b65bdea..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/wfc_stadium.png b/data/styles/clear/style-clear/xxhdpi/wfc_stadium.png
deleted file mode 100644
index c1ea3fc7dd..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/wfc_ticket.png b/data/styles/clear/style-clear/xxhdpi/wfc_ticket.png
deleted file mode 100644
index 3e5326ffcd..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/wfc_fanzone.png b/data/styles/clear/style-clear/xxxhdpi/wfc_fanzone.png
deleted file mode 100644
index 62573eabb3..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/wfc_shop.png b/data/styles/clear/style-clear/xxxhdpi/wfc_shop.png
deleted file mode 100644
index 468a9efcbf..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/wfc_stadium.png b/data/styles/clear/style-clear/xxxhdpi/wfc_stadium.png
deleted file mode 100644
index 520a5cbf8a..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/wfc_ticket.png b/data/styles/clear/style-clear/xxxhdpi/wfc_ticket.png
deleted file mode 100644
index 1d54e2762a..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/wfc_fanzone.png b/data/styles/clear/style-night/6plus/wfc_fanzone.png
deleted file mode 100644
index eaf57221a8..0000000000
Binary files a/data/styles/clear/style-night/6plus/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/wfc_shop.png b/data/styles/clear/style-night/6plus/wfc_shop.png
deleted file mode 100644
index b5ed34becb..0000000000
Binary files a/data/styles/clear/style-night/6plus/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/wfc_stadium.png b/data/styles/clear/style-night/6plus/wfc_stadium.png
deleted file mode 100644
index 095b10df13..0000000000
Binary files a/data/styles/clear/style-night/6plus/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/wfc_ticket.png b/data/styles/clear/style-night/6plus/wfc_ticket.png
deleted file mode 100644
index 03fb7e1ab0..0000000000
Binary files a/data/styles/clear/style-night/6plus/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/wfc_fanzone.png b/data/styles/clear/style-night/hdpi/wfc_fanzone.png
deleted file mode 100644
index a0c8411ee1..0000000000
Binary files a/data/styles/clear/style-night/hdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/wfc_shop.png b/data/styles/clear/style-night/hdpi/wfc_shop.png
deleted file mode 100644
index 4851eae9fb..0000000000
Binary files a/data/styles/clear/style-night/hdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/wfc_stadium.png b/data/styles/clear/style-night/hdpi/wfc_stadium.png
deleted file mode 100644
index ea87032f67..0000000000
Binary files a/data/styles/clear/style-night/hdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/wfc_ticket.png b/data/styles/clear/style-night/hdpi/wfc_ticket.png
deleted file mode 100644
index 150236e06a..0000000000
Binary files a/data/styles/clear/style-night/hdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/wfc_fanzone.png b/data/styles/clear/style-night/mdpi/wfc_fanzone.png
deleted file mode 100644
index 5a9c12444f..0000000000
Binary files a/data/styles/clear/style-night/mdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/wfc_shop.png b/data/styles/clear/style-night/mdpi/wfc_shop.png
deleted file mode 100644
index 5456ead2d9..0000000000
Binary files a/data/styles/clear/style-night/mdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/wfc_stadium.png b/data/styles/clear/style-night/mdpi/wfc_stadium.png
deleted file mode 100644
index fa88fa3549..0000000000
Binary files a/data/styles/clear/style-night/mdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/wfc_ticket.png b/data/styles/clear/style-night/mdpi/wfc_ticket.png
deleted file mode 100644
index 7a62d8566e..0000000000
Binary files a/data/styles/clear/style-night/mdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-night/symbols/wfc_bus-m.svg b/data/styles/clear/style-night/symbols/wfc_bus-m.svg
deleted file mode 100644
index 542b25f377..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_bus-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wfc_bus-s.svg b/data/styles/clear/style-night/symbols/wfc_bus-s.svg
deleted file mode 100644
index c4d37cc565..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_bus-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/wfc_subway-m.svg b/data/styles/clear/style-night/symbols/wfc_subway-m.svg
deleted file mode 100644
index 7e833faee4..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_subway-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wfc_subway-s.svg b/data/styles/clear/style-night/symbols/wfc_subway-s.svg
deleted file mode 100644
index efa920b295..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_subway-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wfc_train-m.svg b/data/styles/clear/style-night/symbols/wfc_train-m.svg
deleted file mode 100644
index 37adccbd50..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_train-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/wfc_train-s.svg b/data/styles/clear/style-night/symbols/wfc_train-s.svg
deleted file mode 100644
index d1559077e8..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_train-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/wfc_tram-m.svg b/data/styles/clear/style-night/symbols/wfc_tram-m.svg
deleted file mode 100644
index 0054e1705a..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_tram-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wfc_tram-s.svg b/data/styles/clear/style-night/symbols/wfc_tram-s.svg
deleted file mode 100644
index 2f8f16d71a..0000000000
--- a/data/styles/clear/style-night/symbols/wfc_tram-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/xhdpi/wfc_fanzone.png b/data/styles/clear/style-night/xhdpi/wfc_fanzone.png
deleted file mode 100644
index ec412a71c0..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/wfc_shop.png b/data/styles/clear/style-night/xhdpi/wfc_shop.png
deleted file mode 100644
index 33db09528b..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/wfc_stadium.png b/data/styles/clear/style-night/xhdpi/wfc_stadium.png
deleted file mode 100644
index 0b22784f3d..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/wfc_ticket.png b/data/styles/clear/style-night/xhdpi/wfc_ticket.png
deleted file mode 100644
index cb779324cd..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/wfc_fanzone.png b/data/styles/clear/style-night/xxhdpi/wfc_fanzone.png
deleted file mode 100644
index 50238f1864..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/wfc_shop.png b/data/styles/clear/style-night/xxhdpi/wfc_shop.png
deleted file mode 100644
index 56f7bbc6b8..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/wfc_stadium.png b/data/styles/clear/style-night/xxhdpi/wfc_stadium.png
deleted file mode 100644
index 6a6aad3643..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/wfc_ticket.png b/data/styles/clear/style-night/xxhdpi/wfc_ticket.png
deleted file mode 100644
index 91a1c000ca..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/wfc_fanzone.png b/data/styles/clear/style-night/xxxhdpi/wfc_fanzone.png
deleted file mode 100644
index 763d384d29..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/wfc_fanzone.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/wfc_shop.png b/data/styles/clear/style-night/xxxhdpi/wfc_shop.png
deleted file mode 100644
index 2285efd21f..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/wfc_shop.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/wfc_stadium.png b/data/styles/clear/style-night/xxxhdpi/wfc_stadium.png
deleted file mode 100644
index e848c78a0c..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/wfc_stadium.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/wfc_ticket.png b/data/styles/clear/style-night/xxxhdpi/wfc_ticket.png
deleted file mode 100644
index 1c38155d5e..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/wfc_ticket.png and /dev/null differ
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 0d1ab6bc51..3f3c4066d9 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -202,10 +202,6 @@ area[amenity=parking],
node[railway=station][transport=subway],
{z-index: 3100;}
-node[event=fc2018],
-area[event=fc2018]
-{z-index: 3200;}
-
node[amenity=fuel],
area[amenity=fuel],
node[amenity=charging_station],
@@ -1163,35 +1159,3 @@ area|z14-[sponsored=partner19]
node|z15-[sponsored=partner20],
area|z15-[sponsored=partner20]
{icon-image: partner20-l.svg;text: none;}
-
-/* Fifa */
-
-node|z13-[event=fc2018],
-area|z13-[event=fc2018]
-{font-size: 10;text: name;text-color: @poi_label;text-offset: 1;}
-
-node|z13-14[event=fc2018][leisure=stadium],
-area|z13-14[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 16;}
-
-node|z15-16[event=fc2018][leisure=stadium],
-area|z15-16[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 12;}
-
-node|z17-[event=fc2018][leisure=stadium],
-area|z17-[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 10;}
-
-node|z15-[event=fc2018][shop=ticket],
-area|z15-[event=fc2018][shop=ticket],
-node|z15-[event=fc2018][olympics=official_building],
-area|z15-[event=fc2018][olympics=official_building],
-{icon-image: wfc_ticket.svg;icon-min-distance: 10;}
-
-node|z15-[event=fc2018][olympics=live_site],
-area|z15-[event=fc2018][olympics=live_site]
-{icon-image: wfc_fanzone.svg;icon-min-distance: 10;}
-
-node|z15-[event=fc2018][shop=gift],
-area|z15-[event=fc2018][shop=gift]
-{icon-image: wfc_shop.svg;icon-min-distance: 10;}