Remove some comments that just get in the way

Change-Id: I6490cae49b09b91d443665de435d2037281c2461