diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index b5f33884ac..a2eaae19d0 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -1290,13 +1290,14 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 				// local_indexes_cat_gpx now obsolete in new UI screen which shows only GPX data
 				// if (Algorithms.objectEquals(getActivity().getString(R.string.local_indexes_cat_gpx) + " " +
 				// g.subfolder, cat)) {
-				if (objectEquals("" + g.subfolder, cat)) {
+				if (objectEquals(g.subfolder, cat)) {
 					found = i;
 					break;
 				}
 			}
 			if (found != -1) {
 				data.get(category.get(found)).remove(g);
+				selected.remove(g);
 			}
 		}
 	}
@@ -1507,17 +1508,15 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 			int total = 0;
 			for (GpxInfo info : params) {
 				if (!isCancelled() && (info.gpx == null || !info.gpx.showCurrentTrack)) {
-					boolean successfull;
-					successfull = removeAllFiles(info.file);
-					app.getGpxDbHelper().remove(info.file);
+					boolean successful = FileUtils.removeGpxFile(app, info.file);
 					total++;
-					if (successfull) {
+					if (successful) {
 						count++;
 						publishProgress(info);
 					}
 				}
 			}
-			return app.getString(R.string.local_index_items_deleted, count, total);
+			return getString(R.string.local_index_items_deleted, count, total);
 		}
 
 		@Override
diff --git a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
index b2d3aaa7dd..ef2bd196a7 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
@@ -866,7 +866,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 						R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
-								if (FileUtils.removeGpxFile(app, new File((gpxFile.path)))) {
+								if (FileUtils.removeGpxFile(app, new File(gpxFile.path))) {
 									dismiss();
 								}
 							}