Remove clutter comments

Change-Id: I84ea6e8399a51c063c52d72399e29c9be944bc44