The more redundant cases of whitespace/comments had to go...

Change-Id: Id0bfab5f60f123c0a4d3d9f8468791e0d8046225