Renamed GPS -> Gps to fix convention flaunting bug
Removed the new configuration options to use the new server