am a4d3fae7: am a184d4b9: Merge change I11526e6c into eclair-mr2

Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'

* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
  Clean up codes and remove/modify stale codes/comments.