API Cleanup.