Fix a small problem with animations.
Cleanup unneeded imports