diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 384a2a3b3e..39a024c4eb 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,20 +9,22 @@
          1. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="audionotes_plugin_description">Audio notes plugin description</string>
+    <string name="audionotes_plugin_name">Audio notes plugin</string>
     <string name="index_srtm_parts">parts</string>
     <string name="index_srtm_ele">Elevation lines</string>
-    <string name="srtm_plugin_description">SRTM plugin (TODO description)</string>
-    <string name="srtm_plugin_name">SRTM plugin</string>
+    <string name="srtm_plugin_description">This plugin allows to download eleveation lines (Download maps -> Menu -> "Other maps") for specific region and use them with offline maps.</string>
+    <string name="srtm_plugin_name">Elevation lines plugin</string>
     <string name="download_select_map_types">Other maps</string>
     <string name="download_roads_only_item">Roads </string>
-    <string name="download_srtm_maps">SRTM maps</string>
+    <string name="download_srtm_maps">Elevation maps</string>
     <string name="download_regular_maps">Regular maps</string>
     <string name="download_roads_only_maps">Roads-only maps</string>
     
 	<string name="rendering_attr_noAdminboundaries_name">Hide boundaries</string>
 	<string name="rendering_attr_noAdminboundaries_description">Suppress display of regional boundaries (admin levels 5-9)</string>
     <string name="osmodroid_plugin_old_ver_not_supported">OsMoDroid plugin has an old version and needs to be updated.</string>
-    <string name="osmodroid_plugin_description">OsMoDroid plugin (TODO description)</string>
+    <string name="osmodroid_plugin_description">OsMoDroid plugin is OsmAnd extension for OsModroid application for live tracking features. Information about the service is available on http://esya.ru.</string>
     <string name="osmodroid_plugin_name">OsMoDroid plugin</string>
 	<string name="tip_altitude_offset">Altitude Display - Offset Correction</string>
 	<string name="tip_altitude_offset_t">\tMost GPS devices report altitude measurements in the ellipsoid-based WGS84 reference system, from which a conversion to locally used systems requires a position-dependent correction.
diff --git a/OsmAnd/src/net/osmand/CallbackWithObject.java b/OsmAnd/src/net/osmand/CallbackWithObject.java
deleted file mode 100644
index c3651019bd..0000000000
--- a/OsmAnd/src/net/osmand/CallbackWithObject.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.osmand;
-
-/**
- * That class is designed to be common interface for callbacks with one param
- * @author victor
- * @param <T>
- */
-public interface CallbackWithObject<T> {
-	
-	
-	/**
-	 * Calls on processing result
-	 * @param result could be null depends on usage
-	 * @return processed or not
-	 */
-	public boolean processResult(T result);
-
-}
diff --git a/OsmAnd/src/net/osmand/FavouritePoint.java b/OsmAnd/src/net/osmand/FavouritePoint.java
deleted file mode 100644
index be2fd262e9..0000000000
--- a/OsmAnd/src/net/osmand/FavouritePoint.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package net.osmand;
-
-import java.io.Serializable;
-
-public class FavouritePoint implements Serializable {
-	private static final long serialVersionUID = 729654300829771466L;
-	private String name;
-	private String category = "";
-	private double latitude;
-	private double longitude;
-	private boolean stored = false;
-	
-
-	public FavouritePoint(){
-	}
-
-	public FavouritePoint(double latitude, double longitude, String name, String category) {
-		this.latitude = latitude;
-		this.longitude = longitude;
-		this.category = category;
-		this.name = name;
-	}
-
-	public double getLatitude() {
-		return latitude;
-	}
-
-	public boolean isStored() {
-		return stored;
-	}
-	public void setStored(boolean stored) {
-		this.stored = stored;
-	}
-
-	public void setLatitude(double latitude) {
-		this.latitude = latitude;
-	}
-
-	public double getLongitude() {
-		return longitude;
-	}
-
-	public void setLongitude(double longitude) {
-		this.longitude = longitude;
-	}
-	
-	public String getCategory() {
-		return category;
-	}
-	
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	@Override
-	public String toString() {
-		return "Favourite " + getName(); //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
new file mode 100644
index 0000000000..93c638721b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -0,0 +1,51 @@
+package net.osmand.plus.audionotes;
+
+import net.osmand.LogUtil;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+
+import org.apache.commons.logging.Log;
+
+public class AudioVideoNotesPlugin extends OsmandPlugin {
+
+	public static final String ID = "osmand.audionotes";
+	private static final Log log = LogUtil.getLog(AudioVideoNotesPlugin.class);
+	private OsmandApplication app;
+	
+	@Override
+	public String getId() {
+		return ID;
+	}
+
+	public AudioVideoNotesPlugin(OsmandApplication app) {
+		this.app = app;
+
+	}
+
+	@Override
+	public String getDescription() {
+		return app.getString(R.string.audionotes_plugin_description);
+	}
+
+	@Override
+	public String getName() {
+		return app.getString(R.string.audionotes_plugin_name);
+	}
+
+	@Override
+	public boolean init(final OsmandApplication app) {
+		return true;
+	}
+
+	@Override
+	public void registerLayers(MapActivity activity) {
+
+	}
+	
+	@Override
+	public void disable(OsmandApplication app) {
+	}
+
+}