Working on Delete logic