Clean up startXrefQueue logic
Some quick clean up to remove unncessary changes