CORE-307 - Cleaning up the API.