Remove some merge artifacts that crept in somehow.  Sensor code should be current now.