Merge change I45094a34 into eclair

* changes:
  remove dead code