Cleanup Animation code

Cleanup methods and classes that are no longer used in animations. Also, single-purpose classes/interface may be usually merged into the class that uses them.