Fixup whitespace changes, remove commented code.

This is a light touchup of 2ef9df8aee696993d9eb235fd36caa4cbcfd3624

Change-Id: Icfaf6fb0111c85b5f78010b16bdda0e237419323