Remove toggles for old systems