Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 7586)
+++ data/defaultpresets.xml	(working copy)
@@ -3375,20 +3375,6 @@
             <space />
             <reference ref="contact" />
         </item> <!-- Night Club -->
-        <item name="Strip Club" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=stripclub"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=stripclub"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=stripclub" />
-            <space />
-            <key key="amenity" value="stripclub" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <reference ref="internet_smoking_wheelchair" />
-            <space />
-            <reference ref="contact" />
-        </item> <!-- Strip Club -->
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing.png">
         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway" preset_name_label="true">
@@ -3634,23 +3620,6 @@
             <space />
             <reference ref="contact" />
         </item> <!-- Horse Riding -->
-        <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=brothel"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=brothel"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=brothel"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=brothel"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=brothel"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=brothel" />
-            <space />
-            <key key="amenity" value="brothel" />
-            <reference ref="name_operator_oh" />
-            <space />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
-            <space />
-            <reference ref="contact" />
-        </item> <!-- Brothel -->
         <separator/>
         <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"