Merge change I5f14b939 into eclair-mr2

* changes:
  Getting rid of some dead code