Removed the delete queue and a bunch of comments that were unnecessary