simplify code for queue/bor/start phases