Clean up animator APIs