Merge "Cleaning up animation code"