Merge change 403 into donut

* changes:
  remove superfluous lines