diff --git a/myTracks/build.gradle b/myTracks/build.gradle
index ff84b4e17..8b958f264 100644
--- a/myTracks/build.gradle
+++ b/myTracks/build.gradle
@@ -24,6 +24,6 @@ dependencies {
     implementation project(':myTracksLib')
 
     implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'com.google.android.gms:play-services:12.0.1'
-    implementation 'com.google.android.gms:play-services-auth:17.0.0'
+    //implementation 'com.google.android.gms:play-services:12.0.1'
+    //implementation 'com.google.android.gms:play-services-auth:17.0.0'
 }
diff --git a/myTracks/src/main/res/menu/list_context_menu.xml b/myTracks/src/main/res/menu/list_context_menu.xml
index a6870876a..5ec793768 100644
--- a/myTracks/src/main/res/menu/list_context_menu.xml
+++ b/myTracks/src/main/res/menu/list_context_menu.xml
@@ -13,31 +13,30 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:icon="@drawable/ic_menu_share"
         android:id="@+id/list_context_menu_share"
         android:title="@string/menu_share"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:icon="@drawable/ic_menu_show_on_map"
         android:id="@+id/list_context_menu_show_on_map"
         android:title="@string/menu_show_on_map"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:icon="@drawable/ic_menu_edit"
         android:id="@+id/list_context_menu_edit"
         android:title="@string/menu_edit"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:icon="@drawable/ic_menu_delete"
         android:id="@+id/list_context_menu_delete"
         android:title="@string/menu_delete"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:icon="@drawable/ic_menu_select_all"
         android:id="@+id/list_context_menu_select_all"
         android:title="@string/menu_select_all"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/marker_detail.xml b/myTracks/src/main/res/menu/marker_detail.xml
index 9ff2c041c..98b58ebc7 100644
--- a/myTracks/src/main/res/menu/marker_detail.xml
+++ b/myTracks/src/main/res/menu/marker_detail.xml
@@ -13,26 +13,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:icon="@drawable/ic_menu_show_on_map"
         android:id="@+id/marker_detail_show_on_map"
-        android:title="@string/menu_show_on_map"
-        app:showAsAction="ifRoom" />
+        android:icon="@drawable/ic_menu_show_on_map"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_show_on_map" />
     <item
-        android:icon="@drawable/ic_menu_edit"
         android:id="@+id/marker_detail_edit"
-        android:title="@string/menu_edit"
-        app:showAsAction="ifRoom" />
+        android:icon="@drawable/ic_menu_edit"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_edit" />
     <item
-        android:icon="@drawable/ic_menu_delete"
         android:id="@+id/marker_detail_delete"
-        android:title="@string/menu_delete"
-        app:showAsAction="ifRoom" />
+        android:icon="@drawable/ic_menu_delete"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_delete" />
     <item
-        android:icon="@drawable/ic_menu_view_photo"
         android:id="@+id/marker_detail_view_photo"
-        android:title="@string/menu_view_photo"
-        app:showAsAction="ifRoom" />
+        android:icon="@drawable/ic_menu_view_photo"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_view_photo" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/marker_list.xml b/myTracks/src/main/res/menu/marker_list.xml
index 4ad5aa767..4d87bddcd 100644
--- a/myTracks/src/main/res/menu/marker_list.xml
+++ b/myTracks/src/main/res/menu/marker_list.xml
@@ -13,17 +13,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:icon="@drawable/ic_menu_insert_marker"
         android:id="@+id/marker_list_insert_marker"
-        app:showAsAction="ifRoom"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_insert_marker" />
     <item
         android:icon="@drawable/ic_menu_search"
         android:id="@+id/marker_list_search"
         android:title="@string/menu_search"
-        app:showAsAction="ifRoom|collapseActionView"
-        app:actionViewClass="androidx.appcompat.widget.SearchView" />
+        android:showAsAction="ifRoom|collapseActionView"
+        android:actionViewClass="androidx.appcompat.widget.SearchView" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/search_list.xml b/myTracks/src/main/res/menu/search_list.xml
index 4c7885607..bd67cbd31 100644
--- a/myTracks/src/main/res/menu/search_list.xml
+++ b/myTracks/src/main/res/menu/search_list.xml
@@ -13,12 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:icon="@drawable/ic_menu_search"
         android:id="@+id/search_list_search"
         android:title="@string/menu_search"
-        app:showAsAction="ifRoom|collapseActionView"
-        app:actionViewClass="androidx.appcompat.widget.SearchView" />
+        android:showAsAction="ifRoom|collapseActionView"
+        android:actionViewClass="androidx.appcompat.widget.SearchView" />
 </menu>
\ No newline at end of file
diff --git a/myTracks/src/main/res/menu/track_detail.xml b/myTracks/src/main/res/menu/track_detail.xml
index 31407e127..621510172 100644
--- a/myTracks/src/main/res/menu/track_detail.xml
+++ b/myTracks/src/main/res/menu/track_detail.xml
@@ -13,25 +13,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:icon="@drawable/ic_menu_insert_marker"
         android:id="@+id/track_detail_insert_marker"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_insert_marker" />
     <item
         android:icon="@drawable/ic_menu_insert_photo"
         android:id="@+id/track_detail_insert_photo"
         android:orderInCategory="2"
-        app:showAsAction="ifRoom"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_insert_photo" />
     <item
         android:icon="@drawable/ic_menu_share"
         android:id="@+id/track_detail_share"
         android:orderInCategory="4"
-        app:showAsAction="ifRoom"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_share" />
     <item
         android:icon="@drawable/ic_menu_markers"
diff --git a/myTracks/src/main/res/menu/track_list.xml b/myTracks/src/main/res/menu/track_list.xml
index e47bca4f1..0277f12e5 100644
--- a/myTracks/src/main/res/menu/track_list.xml
+++ b/myTracks/src/main/res/menu/track_list.xml
@@ -19,13 +19,13 @@ limitations under the License.
         android:icon="@drawable/ic_menu_search"
         android:id="@+id/track_list_search"
         android:title="@string/menu_search"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always" />
+        android:actionViewClass="androidx.appcompat.widget.SearchView"
+        android:showAsAction="always" />
     <item
         android:icon="@drawable/ic_menu_start_gps"
         android:id="@+id/track_list_start_gps"
         android:title="@string/menu_start_gps"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:icon="@drawable/ic_menu_aggregated_statistics"
         android:id="@+id/track_list_aggregated_statistics"
diff --git a/myTracks/src/main/res/xml/sensor_settings.xml b/myTracks/src/main/res/xml/sensor_settings.xml
index ee05da480..ceac320e2 100644
--- a/myTracks/src/main/res/xml/sensor_settings.xml
+++ b/myTracks/src/main/res/xml/sensor_settings.xml
@@ -17,10 +17,6 @@ limitations under the License.
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:key="@string/settings_sensor_root_key"
   android:title="@string/settings_sensor" >
-  <com.google.android.apps.mytracks.settings.MyTracksListPreference
-    android:defaultValue="@string/sensor_type_value_none"
-    android:key="@string/sensor_type_key"
-    android:title="@string/settings_sensor_type" />
   <PreferenceCategory
     android:key="@string/settings_sensor_bluetooth_key"
     android:title="@string/settings_sensor_bluetooth" >