diff --git a/app/src/main/res/layout/activity_db_management.xml b/app/src/main/res/layout/activity_db_management.xml
index d774c2fcc..56cbe2c39 100644
--- a/app/src/main/res/layout/activity_db_management.xml
+++ b/app/src/main/res/layout/activity_db_management.xml
@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:grid="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,7 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.GridLayout
+        <android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:grid="http://schemas.android.com/apk/res-auto"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,8 +29,8 @@
             <Button
                 android:id="@+id/importDBButton"
                 android:text="Import DB"
-                grid:layout_column="1"
-                grid:layout_gravity="center" />
+                grid:layout_gravity="center"
+                grid:layout_column="1" />
 
 
             <TextView
@@ -50,13 +50,6 @@
                 grid:layout_columnSpan="2"
                 grid:layout_columnWeight="1" />
 
-            <Button
-                android:id="@+id/chooseDirectory"
-                android:text="Choose Directory"
-                grid:layout_columnSpan="2"
-                grid:layout_columnWeight="1"
-                grid:layout_gravity="center" />
-
 
             <TextView
                 android:id="@+id/mergeOldActivityDataTitle"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e1a41c959..ea56b1b3a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -101,13 +101,6 @@
             android:defaultValue="true"
             android:key="charts_allow_swipe"
             android:title="@string/pref_title_charts_swipe" />
-        <ListPreference
-            android:defaultValue="metric"
-            android:entries="@array/pref_entries_unit_system"
-            android:entryValues="@array/pref_values_unit_system"
-            android:key="measurement_system"
-            android:summary="%s"
-            android:title="@string/pref_title_unit_system" />
     </PreferenceCategory>
     <PreferenceCategory
         android:key="pref_key_datetime"