Merge changes I76513387,I335fb671 into gingerbread

* changes:
  Remove dead code, and make the animation a setting.
  turn off the electron beam