Updating API for final cleanup.