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

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