Fix gps and cleanup