Cleaned up APIs.