Remove unused code
Fix problems spotted by test_browser_navigation_to_deleted_workspace