Swap keybind between helm-swoop and shell-pop

And remove needless bindings