more cleanup and sensor