removed more gps vestiges