Remove clutter comments

Change-Id: I35a4b3cf3f5a9f379c7c2e4b4cb24306359aedda