diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index d6d12e3..db00dfd 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -41,6 +41,7 @@
+
@@ -107,8 +108,32 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -117,8 +142,8 @@
-
-
+
+
@@ -898,17 +923,17 @@
-
+
-
-
-
+
+
+
@@ -953,6 +978,8 @@
+
+
@@ -971,10 +998,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -1199,7 +1290,7 @@
-
+
@@ -1214,14 +1305,14 @@
-
+
-
+
@@ -1285,9 +1376,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1303,7 +1468,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1422,15 +1601,15 @@
+
+
+
-
-
-
@@ -1439,13 +1618,6 @@
-
-
-
-
-
-
-
@@ -1463,17 +1635,39 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
index 7a09134..2824179 100644
--- a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
+++ b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
@@ -5,7 +5,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.location.Location;
import android.os.Bundle;
import android.os.SystemClock;
import android.support.v7.app.ActionBarActivity;
@@ -19,8 +18,6 @@
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesUtil;
-import com.google.android.gms.location.LocationClient;
-import com.google.android.gms.location.LocationRequest;
import com.loopj.android.http.AsyncHttpResponseHandler;
import java.util.UUID;
@@ -38,13 +35,7 @@
private static Button trackingButton;
private static Button saveButton;
- private LocationRequest locationRequest;
- private LocationClient locationClient;
- private Location previousLocation;
- private float totalDistanceInMeters = 0.0f;
- private boolean firstTimeGettingPosition = true;
private boolean currentlyTracking;
- private String sessionID;
private RadioGroup intervalRadioGroup;
private int intervalInMinutes = 1;
private AlarmManager alarmManager;