diff --git a/resources/frontend_client/app/components/canvas/canvas.css b/resources/frontend_client/app/components/canvas/canvas.css
deleted file mode 100644
index 94fe015e4ac09bef3cdb2aa6a09253a19038bc16..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/components/canvas/canvas.css
+++ /dev/null
@@ -1,34 +0,0 @@
-:root {
-  --canvas-bg-color: #fff;
-  --canvas-offset: 61px;
-}
-
-.Canvas {
-  position: absolute;
-  top: var(--canvas-offset);
-  margin-bottom: calc(var(--canvas-offset) * -1);
-  padding-bottom: var(--canvas-offset);
-  right: 0;
-  height: 100%;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  background-color: var(--canvas-bg-color);
-}
-
-.Canvas--new .card-inner {
-  height: 200px;
-}
-
-.Canvas--new .Card {
-  padding-top: 1em;
-}
-
-.Canvas--new .Card-heading {
-  display: none;
-}
-
-@media screen and (--breakpoint-min-lg) {
-  .Canvas--new .card-inner {
-    height: auto;
-  }
-}
diff --git a/resources/frontend_client/app/components/workspace/workspace.css b/resources/frontend_client/app/components/workspace/workspace.css
deleted file mode 100644
index 87c171704a68a24ae1790c11ee792dcd44c3ff00..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/components/workspace/workspace.css
+++ /dev/null
@@ -1,27 +0,0 @@
-:root {
-  --workspace-bg-color: #F4F6F8;
-  --workspace-border-color: #d9d9d9;
-  --workspace-offset: 61px;
-}
-
-.Workspace {
-  position: absolute;
-  left: 0;
-  top: var(--workspace-offset);
-  padding-bottom: var(--workspace-offset);
-  margin-bottom: calc(var(--workspace-offset) * -1);
-  overflow-y: scroll;
-  bottom: 0;
-  background-color: var(--workspace-bg-color);
-  border-left: 1px solid var(--workspace-border-color);
-  border-right: 1px solid var(--workspace-border-color);
-  z-index: 2;
-  box-shadow: 1px 0 2px rgba(0, 0, 0, .12);
-}
-
-@media screen and (--breakpoint-min-md) {
-  .Workspace {
-    box-shadow: none;
-  }
-}
-
diff --git a/resources/frontend_client/app/components/workspace/workspace.html b/resources/frontend_client/app/components/workspace/workspace.html
deleted file mode 100644
index 60ce79590bcd6ac04fed7de2d5cf55241100a847..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/components/workspace/workspace.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="Workspace col-sm-11 col col-md-3 col-lg-3">
-    <div ng-transclude></div>
-</div>
diff --git a/resources/frontend_client/app/components/workspace/workspace.js b/resources/frontend_client/app/components/workspace/workspace.js
deleted file mode 100644
index de8eef790d54f60533cbb3e3e283797b6942dbcf..0000000000000000000000000000000000000000
--- a/resources/frontend_client/app/components/workspace/workspace.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-angular.module('corvus.components')
-    .directive('cvWorkspace', function () {
-
-        function link (scope, element, attrs) {
-        }
-
-        return {
-            restrict: 'E',
-            templateUrl: '/app/components/workspace/workspace.html',
-            transclude: true,
-            scope: {},
-            link: link
-        };
-    });
diff --git a/src/metabase/core.clj b/src/metabase/core.clj
index 182a39716002b32f1e4f6cb215a3cee5b73cb58c..2e269bcd1f7b72c9dbc4d0f54eb4fc3e76748101 100644
--- a/src/metabase/core.clj
+++ b/src/metabase/core.clj
@@ -59,7 +59,8 @@
                            setup-url
                            "\n\n"))
     ;; Attempt to browse URL on user's system; this will just fail silently if we can't do it
-    (browse-url setup-url)))
+    ;(browse-url setup-url)
+    ))
 
 
 (defn init
diff --git a/src/metabase/driver/mongo/util.clj b/src/metabase/driver/mongo/util.clj
index 066e109be6053f4f81aa309146e4bd4455d2cebb..886347bedb6b4bdf5f41294d131e3830e6ee908f 100644
--- a/src/metabase/driver/mongo/util.clj
+++ b/src/metabase/driver/mongo/util.clj
@@ -1,6 +1,7 @@
 (ns metabase.driver.mongo.util
   "`*mongo-connection*`, `with-mongo-connection`, and other functions shared between several Mongo driver namespaces."
-  (:require [clojure.tools.logging :as log]
+  (:require [clojure.string :as s]
+            [clojure.tools.logging :as log]
             [colorize.core :as color]
             [monger.core :as mg]
             [metabase.driver :as driver]))
@@ -11,12 +12,12 @@
          dbname]}
   (str "mongodb://"
        user
-       (when pass
-         (assert user "Can't have a password without a user!")
+       (when-not (s/blank? pass)
+         (assert (not (s/blank? user)) "Can't have a password without a user!")
          (str ":" pass))
-       (when user "@")
+       (when-not (s/blank? user) "@")
        host
-       (when port
+       (when-not (s/blank? (str port))
          (str ":" port))
        "/"
        dbname))