scheduler: consolidate the active and waiting containers