Cleanup now happens at end of animation