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