minor change
remove switch-window