Remove forced toggle and switch