Revert "GPS cleanup"

This reverts commit 6c048f60002451fb3e7bc8c02eb9cf4b84ef720f.