Clean up the rest of the API access methods.