Remove clutter comments

Change-Id: Ife6ec628e1653a7252aba31e681e047c693ce37b