Start cleaning up the API