Cleaned up API and actors.