diff --git a/MyTracks/.classpath b/MyTracks/.classpath
index b65e415b1..4a148f304 100644
--- a/MyTracks/.classpath
+++ b/MyTracks/.classpath
@@ -1,24 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry kind="lib" path="libs/google-common.jar"/>
-	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/gson-1.6.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/guava-r09.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/httpclient-4.0.3.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/httpcore-4.0.1.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/jackson-core-asl-1.6.7.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/jsr305-1.3.9.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/junit-4.8.2.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="src" path="MyTracksLib_src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
+	<classpathentry kind="lib" path="libs/google-common.jar"/>
+	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/gson-1.6.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/guava-r09.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/jackson-core-asl-1.6.7.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/jsr305-1.3.9.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
+	<classpathentry kind="src" path="MyTracksLib_src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/MyTracks/libs/google-api-client/httpclient-4.0.3.jar b/MyTracks/libs/google-api-client/httpclient-4.0.3.jar
deleted file mode 100644
index 16e349a48..000000000
Binary files a/MyTracks/libs/google-api-client/httpclient-4.0.3.jar and /dev/null differ
diff --git a/MyTracks/libs/google-api-client/httpcore-4.0.1.jar b/MyTracks/libs/google-api-client/httpcore-4.0.1.jar
deleted file mode 100644
index 4aef35e2f..000000000
Binary files a/MyTracks/libs/google-api-client/httpcore-4.0.1.jar and /dev/null differ
diff --git a/MyTracks/libs/google-api-client/junit-4.8.2.jar b/MyTracks/libs/google-api-client/junit-4.8.2.jar
deleted file mode 100644
index 5b4bb849a..000000000
Binary files a/MyTracks/libs/google-api-client/junit-4.8.2.jar and /dev/null differ
diff --git a/MyTracks/proguard.cfg b/MyTracks/proguard.cfg
index 8b178c6b8..17ce7b54e 100644
--- a/MyTracks/proguard.cfg
+++ b/MyTracks/proguard.cfg
@@ -14,6 +14,10 @@
 -dontwarn com.google.android.gsf.**
 -dontwarn org.codehaus.**
 -dontwarn com.google.appengine.**
+-dontwarn org.apache.avalon.framework.logger.**
+-dontwarn org.apache.log.**
+-dontwarn org.apache.log4j.**
+-dontwarn javax.servlet.**
 
 # Make our stack traces useful
 # Line numbers will be correct, file names will be replaced by "MT" since the
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 2ab353a40..4a6f939d0 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -517,12 +517,16 @@ limitations under the License.
   <string name="sending">Sending</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">receive track recording notifications</string>
-  <string name="read_tracks_permission_label">read recorded track data</string>
-  <string name="write_tracks_permission_label">write recorded track data, start/stop recording tracks</string>
-  <string name="notification_permission_description">Be notified when a track starts or stops being recorded.</string>
-  <string name="read_tracks_permission_description">Be able to read track data, such as points and waypoints.</string>
-  <string name="write_tracks_permission_description">Be able to write track data, such as starting recording or adding waypoints.</string>
+  <string name="notification_permission_label">receive MyTracks notifications</string>
+  <string name="read_tracks_permission_label">read MyTracks data</string>
+  <string name="write_tracks_permission_label">write data to MyTracks and start/stop MyTracks
+          recording</string>
+  <string name="notification_permission_description">Allows the application to receive notifications
+          when MyTracks starts or stops a recording.</string>
+  <string name="read_tracks_permission_description">Allows the application to read MyTracks data.
+          </string>
+  <string name="write_tracks_permission_description">Allows the application to write data to
+          MyTracks and start/stop MyTracks recording.</string>
 
   <!-- Sensor Type Options -->
   <string name="no_sensor_option">NONE</string>