Begin cleaning up the API