Minor: Tweaked comments + deleted dead code.

Change-Id: I14206892e07e40132c97bc3a75b126b7d13e2769