Merge change I11526e6c into eclair-mr2

* changes:
  Clean up codes and remove/modify stale codes/comments.