Cleanup and BatterySensor Complete