Remove clutter comments

Change-Id: I6662553e927edda4f106224db861ca3031f20bc7