Cleanup-prep for Sensor.class creation/integration