removing clone logic (addressing issue #2)