Remove cruft from incomplete merge.
Add forest change animation code.