Some code cleanups, and disable animation for now, it's broken.