Clean up of the ANT+ code