am c3c11ecf: am 31ee50d0: Merge change I5f14b939 into eclair-mr2

Merge commit 'c3c11ecf6da6f6de565c9c4daf5448ec939e8cb6'

* commit 'c3c11ecf6da6f6de565c9c4daf5448ec939e8cb6':
  Getting rid of some dead code