Fix previous removal replacing code from new bfq 6r2 merge