Cleaning up the APIController