Cleanup of old rangefinder and motion stuff