remove switch throwing scenario