Remove separation of new AorBs and waiting AorBs