Removed cruft from the delete feature