Completed implementation of SensorSource + cleanup.