core cleanup: move out idle_switch field