Rebind choose-session and command-prompt
Clean up