Final cleanup before integrating new sensor support.