Cleanup + a new key binding.