Remove some pointless API calls...