Deletion tool tweaked with new functionality