More animation cleanup