cleaning up upgrade handling for queue documents