Cleanup gps code