pan/bi: Remove more artefacts of 2-pass scheduling