Some additional Animation cleanup before major refactoring.