(ISSUE-8---add-edit) removed old comments