Attempting to clean up the APIs.