Cleaning up the API.