remove switch-case