Remove commented-out code, etc.

Removed a bunch of obsolete code that had already been commented out.
Also added a NOT_ANIMATED preprocessor constant to replace each instance
of "false /* not animated */".