Cleanup all existing animation code
PoC