cleaned up GPS shiz