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