Cleanup comments

Change-Id: Ibb83be9b874c3a562ec0f0334b02e3df42188fc5