Add in removed switch cases