Clean up location tracking to use most accurate location