Cleanup some of the API in there