diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
index a2f0171..abfa182 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
@@ -49,7 +49,6 @@
     private static final String KEY_POI_ALT = "_alt";
     private static final String KEY_POI_TYPE = "_type";
     private static final String KEY_POI_TIME = "_time";
-    private static final String KEY_TYPE_ID = "_type_id";
 
     private static final String KEY_GP_ID = "_gp_id";
     private static final String KEY_FOUNTAIN_SIZE = "_size";
@@ -90,7 +89,6 @@
                 + KEY_POI_LAT + " REAL,"
                 + KEY_POI_LON + " REAL,"
                 + KEY_POI_ALT + " REAL,"
-                + KEY_TYPE_ID + " TEXT,"
                 + KEY_POI_TIME + " INTEGER" + ")";
         db.execSQL(CREATE_GP_TABLE);
         //create Fountain table
@@ -161,7 +159,6 @@
         String CREATE_IMAGE_TABLE = "CREATE TABLE " + TABLE_IMAGE + "("
                 + KEY_POI_ID + " INTEGER PRIMARY KEY,"
                 + KEY_GP_ID + " INTEGER,"
-                + KEY_TYPE_ID + " TEXT,"
                 + KEY_IMAGE_IMG + " BLOB" + ")";
         db.execSQL(CREATE_IMAGE_TABLE);
         //create trash bin table
@@ -220,7 +217,6 @@
             case Types.PIC:
                 Image i = (Image) poi;
                 values.put(KEY_GP_ID, i.getGpId());
-                values.put(KEY_TYPE_ID, i.getTypeId());
                 values.put(KEY_IMAGE_IMG, i.getImage());
                 break;
             case Types.CELL_RECEPTION:
@@ -261,7 +257,6 @@
                 values.put(KEY_POI_LAT, dbgp.getLat());
                 values.put(KEY_POI_LON, dbgp.getLon());
                 values.put(KEY_POI_ALT, dbgp.getAlt());
-                values.put(KEY_TYPE_ID, dbgp.getTypeId());
                 values.put(KEY_POI_TIME, dbgp.getTime());
                 break;
         }
@@ -310,15 +305,14 @@
         double lat = cursor.getDouble(1);
         double lon = cursor.getDouble(2);
         double alt = cursor.getDouble(3);
-        String type_id = cursor.getString(4);
-        long time = cursor.getLong(5) * 1000;
-        return new DbGeoPoint(gp_id, lat, lon, alt, time, type_id);
+        long time = cursor.getLong(4) * 1000;
+        return new DbGeoPoint(gp_id, lat, lon, alt, time);
     }
 
     private DbGeoPoint getGeoPoint(long gp_id){
         SQLiteDatabase db = getReadableDatabase();
         Cursor gpCursor = db.query(TABLE_GP,
-                new String[]{KEY_POI_ID, KEY_POI_LAT, KEY_POI_LON, KEY_POI_ALT, KEY_TYPE_ID, KEY_POI_TIME},
+                new String[]{KEY_POI_ID, KEY_POI_LAT, KEY_POI_LON, KEY_POI_ALT, KEY_POI_TIME},
                 KEY_POI_ID + "=?",
                 new String[]{String.valueOf(gp_id)}, null, null, null, null);
         if(gpCursor != null){
@@ -412,14 +406,13 @@
     private Image getImageFromCursor(Cursor cursor){
         long _id = cursor.getLong(0);
         long _gp_id = cursor.getLong(1);
-        String type_id = cursor.getString(2);
-        byte[] img = cursor.getBlob(3);
-        return new Image(_id, type_id, img, getGeoPoint(_gp_id));
+        byte[] img = cursor.getBlob(2);
+        return new Image(_id, img, getGeoPoint(_gp_id));
     }
 
     private Image getImage(SQLiteDatabase db, long id){
         Cursor cursor = db.query(TABLE_IMAGE,
-                new String[]{KEY_POI_ID, KEY_GP_ID, KEY_TYPE_ID, KEY_IMAGE_IMG},
+                new String[]{KEY_POI_ID, KEY_GP_ID, KEY_IMAGE_IMG},
                 KEY_POI_ID + "=?",
                 new String[]{String.valueOf(id)}, null, null, null, null);
         if (cursor != null) {
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 91c790e..522274d 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -354,8 +354,6 @@
         dbgp.setId(gp_id);
         Fountain fountain = new Fountain(0, 2, dbgp);
         long f_id = dbHandler.addPoi(fountain);
-        dbgp.setTypeId("fountain_" + f_id);
-        dbHandler.updatePoi(dbgp);
     }
 
     private void toggleDrawerItems(TableLayout layout, int position){
@@ -1002,7 +1000,7 @@
         for(Poi p : poiMarker){
             DbGeoPoint dbgp = p.getGp();
             GeoPoint gp = new GeoPoint(dbgp.getLat(), dbgp.getLon(), dbgp.getAlt());
-            OverlayItem oI = new OverlayItem(String.valueOf(dbgp.getTime()) + "_" + String.valueOf(dbgp.getId()), String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
+            OverlayItem oI = new OverlayItem(String.valueOf(dbgp.getTime()), String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
             Drawable[] iconLayer = new Drawable[2];
             iconLayer[0] = res.getDrawable(R.mipmap.ic_poi);
             BitmapDrawable bd = (BitmapDrawable) res.getDrawable(entryImgs[getPos(p.getType())]);
@@ -1073,7 +1071,7 @@
         for(Poi p : poiMarker){
             DbGeoPoint dbgp = p.getGp();
             GeoPoint gp = new GeoPoint(dbgp.getLat(), dbgp.getLon(), dbgp.getAlt());
-            OverlayItem oI = new OverlayItem(String.valueOf(dbgp.getTime()) + "_" + String.valueOf(dbgp.getId()), String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
+            OverlayItem oI = new OverlayItem(String.valueOf(dbgp.getTime()), String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
             Drawable[] iconLayer = new Drawable[2];
             iconLayer[0] = res.getDrawable(R.mipmap.ic_poi);
             BitmapDrawable bd = (BitmapDrawable) res.getDrawable(entryImgs[getPos(p.getType())]);
@@ -1196,13 +1194,12 @@
             dbgp = new DbGeoPoint(exifLatLon[0], exifLatLon[1], alt, time);
             long rowId = addGp(dbgp);
             dbgp.setId(rowId);
-            dbHandler.updatePoi(dbgp);
         } else {
             String[] uidParts = imageMarker.getUid().split("_");
             long gpId = Long.parseLong(uidParts[1]);
             dbgp = (DbGeoPoint) dbHandler.getPoi(gpId, Types.GP);
         }
-        addPoi(new Image(0, dbgp.getTypeId(), imgData, dbgp));
+        addPoi(new Image(0, imgData, dbgp));
     }
 
     public long addGp(DbGeoPoint dbgp){
@@ -1225,19 +1222,6 @@
         }
         long rowId = dbHandler.addPoi(poi);
         if(rowId >= 0) Toaster(getString(R.string.add_poi_success), true);
-        dbgp.setTypeId(getTypeName(poi.getType()) + "_" + rowId);
-        dbHandler.updatePoi(dbgp);
-
-        if(poi.getType() == Types.PATH){
-            Path path = (Path) poi;
-            path.getEndGp().setTypeId(getTypeName(poi.getType()) + "_" + rowId);
-            dbHandler.updatePoi(path.getEndGp());
-        }/* else if(poi.getType() == Types.LIFT){ //TODO implement addLiftPoi method
-            Lift lift = (Lift) poi;
-            lift.getEndGp().setTypeId(getTypeName(poi.getType()) + "_" + rowId);
-            dbHandler.updatePoi(lift.getEndGp());
-        }*/
-
         return rowId;
     }
 
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java
index f93dc91..54d3bf0 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java
@@ -74,8 +74,6 @@
                         ArrayList<GeoPoint> waypoints = new ArrayList<>();
                         DbGeoPoint current = null;
                         DbGeoPoint last = null;
-                        boolean currentNew = false;
-                        boolean lastNew = false;
                         for(int i=0; i<pathMarkers.size(); ++i){
                             GeoPoint gp = (GeoPoint) pathMarkers.get(i).getPoint();
                             waypoints.add(gp);
@@ -93,24 +91,13 @@
                             current = new DbGeoPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), time);
                             if(pathMarkers.get(i).getTitle() == null){
                                 rowId = ma.addGp(current);
-                                currentNew = true;
                             }
                             current.setId(rowId);
                             if(current != null && last != null){
                                 long poiId = ma.addPoi(new Path(0, 0, exposed, diffWet, giddiness, climbing, last, current));
-                                if(currentNew){
-                                    current.setTypeId("path_" + poiId);
-                                    ma.getDbHandler().updatePoi(current);
-                                }
-                                if(lastNew){
-                                    last.setTypeId("path_" + poiId);
-                                    ma.getDbHandler().updatePoi(last);
-                                }
 
                             }
                             last = current;
-                            lastNew = currentNew;
-                            currentNew = false;
                         }
                         Road road = roadManager.getRoad(waypoints);
                         Polyline line = RoadManager.buildRoadOverlay(road, ma.getApplicationContext());
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java
index c224949..a3415e7 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java
@@ -10,7 +10,6 @@
     private double lon;
     private double alt;
     private long _time;
-    private String _type_id; //<poi-type>_<poi-id-in-table> => hut_2
 
     public DbGeoPoint(long _id) {
         super(_id, Types.GP);
@@ -24,16 +23,15 @@
     }
 
     public DbGeoPoint(double aLatitude, double aLongitude, double aAltitude, long _time) {
-        this(0, aLatitude, aLongitude, aAltitude, _time, "");
+        this(0, aLatitude, aLongitude, aAltitude, _time);
     }
 
-    public DbGeoPoint(long id, double lat, double lon, double alt, long time, String type_id){
+    public DbGeoPoint(long id, double lat, double lon, double alt, long time){
         super(id, Types.GP);
         this.lat = lat;
         this.lon = lon;
         this.alt = alt;
         this._time = time;
-        this._type_id = type_id;
     }
 
     public double getLat(){
@@ -52,14 +50,6 @@
         return _time;
     }
 
-    public String getTypeId(){
-        return _type_id;
-    }
-
-    public void setTypeId(String typeId){
-        _type_id = typeId;
-    }
-
     public void setId(long id){
         _id = id;
     }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java
index 094b116..d30aab0 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java
@@ -6,7 +6,6 @@
  * Created by Vinz on 03.11.2015.
  */
 public class Image extends Poi {
-    String typeId;
     byte[] image;
 
     public Image(long _id) {
@@ -15,16 +14,11 @@
     public Image(){
         super(Types.PIC);
     }
-    public Image(long _id, String typeId, byte[] image, DbGeoPoint gp){
+    public Image(long _id, byte[] image, DbGeoPoint gp){
         super(_id, Types.PIC, gp);
-        this.typeId = typeId;
         this.image = image;
     }
 
-    public String getTypeId(){
-        return typeId;
-    }
-
     public byte[] getImage(){
         return image;
     }