More Animation related clean up.
This is a bit of a mess... :/
Updated builds.