diff --git a/marbledata/bitmaps/airport.png b/marbledata/bitmaps/airport.png
deleted file mode 100644
index 8a814a716..000000000
Binary files a/marbledata/bitmaps/airport.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_1_orange.png b/marbledata/bitmaps/city_1_orange.png
deleted file mode 100644
index eb689aee8..000000000
Binary files a/marbledata/bitmaps/city_1_orange.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_1_red.png b/marbledata/bitmaps/city_1_red.png
deleted file mode 100644
index 9ef0427a6..000000000
Binary files a/marbledata/bitmaps/city_1_red.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_1_white.png b/marbledata/bitmaps/city_1_white.png
deleted file mode 100644
index 4f321950e..000000000
Binary files a/marbledata/bitmaps/city_1_white.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_1_yellow.png b/marbledata/bitmaps/city_1_yellow.png
deleted file mode 100644
index 52e103a59..000000000
Binary files a/marbledata/bitmaps/city_1_yellow.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_2_orange.png b/marbledata/bitmaps/city_2_orange.png
deleted file mode 100644
index 87cdac488..000000000
Binary files a/marbledata/bitmaps/city_2_orange.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_2_red.png b/marbledata/bitmaps/city_2_red.png
deleted file mode 100644
index 029a33ebc..000000000
Binary files a/marbledata/bitmaps/city_2_red.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_2_white.png b/marbledata/bitmaps/city_2_white.png
deleted file mode 100644
index 12f5243b2..000000000
Binary files a/marbledata/bitmaps/city_2_white.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_2_yellow.png b/marbledata/bitmaps/city_2_yellow.png
deleted file mode 100644
index bb9dca25f..000000000
Binary files a/marbledata/bitmaps/city_2_yellow.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_3_orange.png b/marbledata/bitmaps/city_3_orange.png
deleted file mode 100644
index 6781edf8b..000000000
Binary files a/marbledata/bitmaps/city_3_orange.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_3_red.png b/marbledata/bitmaps/city_3_red.png
deleted file mode 100644
index 87287c4e8..000000000
Binary files a/marbledata/bitmaps/city_3_red.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_3_white.png b/marbledata/bitmaps/city_3_white.png
deleted file mode 100644
index 303bd7985..000000000
Binary files a/marbledata/bitmaps/city_3_white.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_3_yellow.png b/marbledata/bitmaps/city_3_yellow.png
deleted file mode 100644
index a920e8dbf..000000000
Binary files a/marbledata/bitmaps/city_3_yellow.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_4_orange.png b/marbledata/bitmaps/city_4_orange.png
deleted file mode 100644
index 7479e37d1..000000000
Binary files a/marbledata/bitmaps/city_4_orange.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_4_red.png b/marbledata/bitmaps/city_4_red.png
deleted file mode 100644
index 599f7533c..000000000
Binary files a/marbledata/bitmaps/city_4_red.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_4_white.png b/marbledata/bitmaps/city_4_white.png
deleted file mode 100644
index 890da268b..000000000
Binary files a/marbledata/bitmaps/city_4_white.png and /dev/null differ
diff --git a/marbledata/bitmaps/city_4_yellow.png b/marbledata/bitmaps/city_4_yellow.png
deleted file mode 100644
index 778455529..000000000
Binary files a/marbledata/bitmaps/city_4_yellow.png and /dev/null differ
diff --git a/marbledata/bitmaps/crater.png b/marbledata/bitmaps/crater.png
deleted file mode 100644
index 870f3a6a2..000000000
Binary files a/marbledata/bitmaps/crater.png and /dev/null differ
diff --git a/marbledata/bitmaps/default_location.png b/marbledata/bitmaps/default_location.png
deleted file mode 100644
index 0d250de95..000000000
Binary files a/marbledata/bitmaps/default_location.png and /dev/null differ
diff --git a/marbledata/bitmaps/empty.png b/marbledata/bitmaps/empty.png
deleted file mode 100644
index 1914264c0..000000000
Binary files a/marbledata/bitmaps/empty.png and /dev/null differ
diff --git a/marbledata/bitmaps/mountain_1.png b/marbledata/bitmaps/mountain_1.png
deleted file mode 100644
index f5ff53e68..000000000
Binary files a/marbledata/bitmaps/mountain_1.png and /dev/null differ
diff --git a/marbledata/bitmaps/pole_1.png b/marbledata/bitmaps/pole_1.png
deleted file mode 100644
index 12af5be0f..000000000
Binary files a/marbledata/bitmaps/pole_1.png and /dev/null differ
diff --git a/marbledata/bitmaps/pole_2.png b/marbledata/bitmaps/pole_2.png
deleted file mode 100644
index aa9afe181..000000000
Binary files a/marbledata/bitmaps/pole_2.png and /dev/null differ
diff --git a/marbledata/bitmaps/shipwreck.png b/marbledata/bitmaps/shipwreck.png
deleted file mode 100644
index a04d7df77..000000000
Binary files a/marbledata/bitmaps/shipwreck.png and /dev/null differ
diff --git a/marbledata/bitmaps/valley.png b/marbledata/bitmaps/valley.png
deleted file mode 100644
index 2b0d5b49b..000000000
Binary files a/marbledata/bitmaps/valley.png and /dev/null differ
diff --git a/marbledata/bitmaps/volcano_1.png b/marbledata/bitmaps/volcano_1.png
deleted file mode 100644
index 78b6b68f6..000000000
Binary files a/marbledata/bitmaps/volcano_1.png and /dev/null differ
diff --git a/marbledata/maps/earth/googlemaps/0/0/0.png b/marbledata/maps/earth/googlemaps/0/0/0.png
deleted file mode 100644
index f7ab669ca..000000000
Binary files a/marbledata/maps/earth/googlemaps/0/0/0.png and /dev/null differ
diff --git a/marbledata/maps/earth/googlemaps/googlemaps.dgml b/marbledata/maps/earth/googlemaps/googlemaps.dgml
deleted file mode 100644
index 01a63864b..000000000
--- a/marbledata/maps/earth/googlemaps/googlemaps.dgml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dgml xmlns="http://edu.kde.org/marble/dgml/2.0">
-    <document>
-
-        <head>
-            <name>Google Maps</name>
-            <target>earth</target>
-            <theme>googlemaps</theme>
-            <icon pixmap="preview.png"/>
-            <visible>true</visible>
-            <description><![CDATA[<p>A <i>global roadmap</i> provided by Google.]]></description>
-            <zoom>
-                <minimum> 900 </minimum>
-                <maximum> 3700 </maximum>
-                <discrete> true </discrete>
-            </zoom>
-        </head>
-
-        <map bgcolor="#000000">
-            <canvas/>
-            <target/>
-            <layer name="googlemaps" backend="texture" >
-                <!-- Let Google Maps rendered tiles expire after one week
-                     (604800 seconds) -->
-                <texture name="map" expire="604800" >
-                    <sourcedir format="PNG"> earth/googlemaps </sourcedir>
-                    <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" />
-                    <projection name="Mercator" />
-                    <downloadUrl protocol="http" host="mt.google.com" path="/vt/lrys=m@130&amp;hl=de&amp;x={x}&amp;y={y}&amp;z={zoomLevel}&amp;s=Ga" />
-                </texture>
-            </layer>
-            <layer name="standardplaces" backend="geodata">
-               <geodata name="cityplacemarks">
-                    <sourcefile format="KML">cityplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="baseplacemarks">
-                    <sourcefile format="KML">baseplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="elevplacemarks">
-                    <sourcefile format="KML">elevplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="otherplacemarks">
-                    <sourcefile
-                    format="KML">otherplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="boundaryplacemarks">
-                    <sourcefile format="KML">boundaryplacemarks</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-            </layer>
-        </map>
-        <settings>
-            <property name="coordinate-grid">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <property name="overviewmap">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <property name="compass">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <property name="scalebar">
-                <value>true</value>
-                <available>true</available>
-            </property>
-        </settings>
-        <legend>
-            <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12">
-                <heading>Coordinate Grid</heading>
-            </section>
-        </legend>
-    </document>
-</dgml>
diff --git a/marbledata/maps/earth/googlemaps/preview.png b/marbledata/maps/earth/googlemaps/preview.png
deleted file mode 100644
index aa3181d29..000000000
Binary files a/marbledata/maps/earth/googlemaps/preview.png and /dev/null differ
diff --git a/marbledata/maps/earth/googlesat/0/0/0.jpg b/marbledata/maps/earth/googlesat/0/0/0.jpg
deleted file mode 100644
index 4b9b73295..000000000
Binary files a/marbledata/maps/earth/googlesat/0/0/0.jpg and /dev/null differ
diff --git a/marbledata/maps/earth/googlesat/bicycle/0/0/0.png b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png
deleted file mode 100644
index febf01a9c..000000000
Binary files a/marbledata/maps/earth/googlesat/bicycle/0/0/0.png and /dev/null differ
diff --git a/marbledata/maps/earth/googlesat/googlesat.dgml b/marbledata/maps/earth/googlesat/googlesat.dgml
deleted file mode 100644
index 187d41334..000000000
--- a/marbledata/maps/earth/googlesat/googlesat.dgml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dgml xmlns="http://edu.kde.org/marble/dgml/2.0">
-    <document>
-
-        <head>
-            <name>Google Satellite</name>
-            <target>earth</target>
-            <theme>googlesat</theme>
-            <icon pixmap="preview.png"/>
-            <visible>true</visible>
-            <description><![CDATA[<p>A <i>global roadmap</i> provided by Google.]]></description>
-            <zoom>
-                <minimum> 900 </minimum>
-                <maximum> 3700 </maximum>
-                <discrete> true </discrete>
-            </zoom>
-        </head>
-
-        <map bgcolor="#000000">
-            <canvas/>
-            <target/>
-            <layer name="googlesat" backend="texture" >
-                <!-- Let Google Maps rendered tiles expire after one year
-                     or 31536000 seconds -->
-                <texture name="map" expire="31536000" >
-                    <sourcedir format="JPG"> earth/googlesat </sourcedir>
-                    <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" />
-                    <projection name="Mercator" />
-                    <downloadUrl protocol="http" host="mt0.google.com" path="/vt/lyrs=s&amp;hl=en&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;s=Ga" />
-                </texture>
-                <texture name="streets" expire="604800" >
-                    <sourcedir format="PNG"> earth/googlesat/streets </sourcedir>
-                    <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" />
-                    <projection name="Mercator" />
-                    <downloadUrl protocol="http" host="mt.google.com" path="/vt/lyrs=h@126&amp;hl=en&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;s=Ga" />
-                    <blending name="OverpaintBlending" />
-                </texture>
-                <texture name="bicycle" expire="604800" >
-                    <sourcedir format="PNG"> earth/googlesat/bicycle </sourcedir>
-                    <storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" />
-                    <projection name="Mercator" />
-                    <downloadUrl protocol="http" host="mt.google.com" path="/vt/lyrs=h@179207685,bike&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;" />
-                    <blending name="OverpaintBlending" />
-                </texture>
-            </layer>
-            <layer name="standardplaces" backend="geodata">
-                <geodata name="cityplacemarks">
-                    <sourcefile format="KML">cityplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="baseplacemarks">
-                    <sourcefile format="KML">baseplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="elevplacemarks">
-                    <sourcefile format="KML">elevplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="otherplacemarks">
-                    <sourcefile format="KML">otherplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-                <geodata name="boundaryplacemarks">
-                    <sourcefile format="KML">boundaryplacemarks.kml</sourcefile>
-                    <pick>placemark</pick>
-                </geodata>
-            </layer>
-        </map>
-        <settings>
-            <property name="coordinate-grid">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <property name="overviewmap">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <property name="compass">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <property name="scalebar">
-                <value>true</value>
-                <available>true</available>
-            </property>
-            <group name="Places">
-                <property name="places">
-                    <value>true</value>
-                    <available>true</available>
-                </property>
-                <property name="cities">
-                    <value>false</value>
-                    <available>false</available>
-                </property>
-                <property name="terrain">
-                    <value>false</value>
-                    <available>false</available>
-                </property>
-                <property name="otherplaces">
-                    <value>false</value>
-                    <available>false</available>
-                </property>
-            </group>
-            <group name="Texture Layers">
-                <property name="streets">
-                    <value>true</value>
-                    <available>true</available>
-                </property>
-                <property name="bicycle">
-                    <value>false</value>
-                    <available>true</available>
-                </property>
-            </group>
-        </settings>
-        <legend>
-            <section name="streets" checkable="true" connect="streets" spacing="12">
-                <heading>Transportation</heading>
-            </section>
-            <section name="bicycle" checkable="true" connect="bicycle" spacing="12">
-                <heading>Bicycle Routes</heading>
-            </section>
-            <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12">
-                <heading>Coordinate Grid</heading>
-            </section>
-            <section name="places" checkable="true" connect="places" spacing="12">
-                <heading>Places of Interest</heading>
-            </section>
-        </legend>
-    </document>
-</dgml>
diff --git a/marbledata/maps/earth/googlesat/preview.png b/marbledata/maps/earth/googlesat/preview.png
deleted file mode 100644
index 5048d0a0f..000000000
Binary files a/marbledata/maps/earth/googlesat/preview.png and /dev/null differ
diff --git a/marbledata/maps/earth/googlesat/streets/0/0/0.png b/marbledata/maps/earth/googlesat/streets/0/0/0.png
deleted file mode 100644
index febf01a9c..000000000
Binary files a/marbledata/maps/earth/googlesat/streets/0/0/0.png and /dev/null differ