Merge change 1685 into donut

* changes:
  Remove unnecessary code.