cleaned up old code

** need to test geolocation on device