Cleaup code previous patch introduced some comments that are not required

Change-Id: Ib89078486d011ea868e9f419874c9d7eef35ef5e