Some more cleanup of the DST, getting rid of all the references to GPS.