Working on delete logic