General cleanup of APIs