For bugzid:26. Implemented Delete. Minor refactor