am ec5c1c1e: am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"

* commit 'ec5c1c1e291062576925b80b532d36df118103f5':
  Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read