diff --git a/app/app.iml b/app/app.iml
index 1655f78..7e64eb1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -61,13 +61,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -75,6 +68,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -95,7 +95,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
index b6a7f54..52721c6 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
@@ -618,9 +618,59 @@
         return rowId;
     }
 
-    //TODO CORE recursive delete (GeoPoint, [Image])
+    private void deleteByGpId(long gpId) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        int nrOfEntries = 0;
+        String[] selections = new String[]{KEY_GP_ID};
+        String selectionArgs = KEY_GP_ID + "=?";
+        String[] values = new String[]{String.valueOf(gpId)};
+        for(int i=0; i<TABLES.length; ++i){
+            String table = TABLES[i];
+            if(table.equals(TABLE_GP)) continue;
+            if(table.equals(TABLE_LIFT) || table.equals(TABLE_PATH)) {
+                selections = new String[]{KEY_GP_S_ID, KEY_GP_E_ID};
+                selectionArgs = KEY_GP_S_ID + "=? OR " + KEY_GP_E_ID + "=?";
+                values = new String[]{String.valueOf(gpId), String.valueOf(gpId)};
+            }
+            Cursor cursor = db.query(TABLES[i],
+                    selections,
+                    selectionArgs,
+                    values, null, null, null, null);
+            nrOfEntries += cursor.getCount();
+        }
+        if(nrOfEntries == 1) { //no other POI uses this geopoint anymore
+            db.delete(
+                    TABLE_GP,
+                    KEY_POI_ID + "=?",
+                    new String[]{String.valueOf(gpId)}
+            );
+        }
+        db.close();
+    }
+
     public void deletePoi(long _id, int type){
         SQLiteDatabase db = this.getWritableDatabase();
+        String table = getTableName(type);
+        if(table.equals(TABLE_PATH) || table.equals(TABLE_LIFT)) {
+            Cursor cursor = db.query(table,
+                    new String[]{KEY_GP_S_ID, KEY_GP_E_ID},
+                    KEY_POI_ID + "=?",
+                    new String[]{String.valueOf(_id)}, null, null, null, null);
+            if(cursor.moveToFirst()){
+                deleteByGpId(cursor.getLong(0));
+                deleteByGpId(cursor.getLong(1));
+            }
+            cursor.close();
+        } else {
+            Cursor cursor = db.query(table,
+                    new String[]{KEY_GP_ID},
+                    KEY_POI_ID + "=?",
+                    new String[]{String.valueOf(_id)}, null, null, null, null);
+            if(cursor.moveToFirst()){
+                deleteByGpId(cursor.getLong(0)); // there is only one column
+            }
+            cursor.close();
+        }
         switch (type){
             case Types.FOUNTAIN:
                 db.delete(TABLE_FOUNTAIN, KEY_POI_ID + "=?",
@@ -667,6 +717,7 @@
                         new String[]{String.valueOf(_id)});
                 break;
         }
+        db.close();
     }
 
     /*