removed some comments that are not needed

jira-issue: WP-1090

removed few commented code which was not any more used.