Removed anything dependent on the API.