Remove comment and whitespace

Change-Id: I66000061a241b150d98e670904b99a4258f73cdd