Moved throttle detection/calibration into Throttle