more cleanup, gpsdata for system restart prep