Added flag to control removal of CBZ insts