Refined choice removal code