Delete function added, queue recover narrowed to certain states