Animation clean ups

Miscellaneous animation clean-ups. No functional changes (I think).