diff --git a/wherehows-web/app/components/datasets/dataset-fabric-switcher.ts b/wherehows-web/app/components/datasets/dataset-fabric-switcher.ts
index 78e9d53ce8..20ac210462 100644
--- a/wherehows-web/app/components/datasets/dataset-fabric-switcher.ts
+++ b/wherehows-web/app/components/datasets/dataset-fabric-switcher.ts
@@ -2,7 +2,7 @@ import Component from '@ember/component';
 import { computed, get, set, getProperties } from '@ember/object';
 import { DatasetPlatform, Fabric } from 'wherehows-web/constants';
 import { action } from '@ember-decorators/object';
-import { buildLiUrn, datasetUrnRegexLI, getFabricFromUrn } from 'wherehows-web/utils/validators/urn';
+import { buildLiUrn, datasetUrnRegexLI, getUrnParts } from 'wherehows-web/utils/validators/urn';
 import { arrayMap } from 'wherehows-web/utils/array';
 import { task, TaskInstance, timeout } from 'ember-concurrency';
 import ComputedProperty from '@ember/object/computed';
@@ -55,7 +55,7 @@ export default class DatasetFabricSwitcher extends Component {
    * @memberof DatasetFabricSwitcher
    */
   fabric: ComputedProperty<Fabric | void> = computed('urn', function(this: DatasetFabricSwitcher): Fabric | void {
-    return getFabricFromUrn(get(this, 'urn'));
+    return getUrnParts(get(this, 'urn')).fabric;
   });
 
   /**
diff --git a/wherehows-web/app/constants/datasets/platform.ts b/wherehows-web/app/constants/datasets/platform.ts
index 96bff72527..993eaa74e2 100644
--- a/wherehows-web/app/constants/datasets/platform.ts
+++ b/wherehows-web/app/constants/datasets/platform.ts
@@ -30,9 +30,8 @@ enum DatasetPlatform {
  */
 enum Fabric {
   Prod = 'PROD',
-  EI = 'EI',
   Corp = 'CORP',
-  Dev = 'DEV'
+  EI = 'EI'
 }
 
 /**
diff --git a/wherehows-web/app/styles/components/dataset-property/_deprecated-dataset.scss b/wherehows-web/app/styles/components/dataset-property/_deprecated-dataset.scss
index a58a2e0346..b127c84820 100644
--- a/wherehows-web/app/styles/components/dataset-property/_deprecated-dataset.scss
+++ b/wherehows-web/app/styles/components/dataset-property/_deprecated-dataset.scss
@@ -1,6 +1,5 @@
 .deprecated-dataset {
   @include pill(set-color(red, maroonflush), set-color(white, base));
-  margin-top: item-spacing(3);
   line-height: item-spacing(5);
 
   &--small {
diff --git a/wherehows-web/app/styles/components/dataset-property/_removed-dataset.scss b/wherehows-web/app/styles/components/dataset-property/_removed-dataset.scss
index 8dfe2f5794..2dbdec3dec 100644
--- a/wherehows-web/app/styles/components/dataset-property/_removed-dataset.scss
+++ b/wherehows-web/app/styles/components/dataset-property/_removed-dataset.scss
@@ -1,6 +1,5 @@
 .removed-dataset {
   @include pill(set-color(red, maroonflush), set-color(white, base));
-  margin-top: item-spacing(3);
   line-height: item-spacing(5);
 
   &--small {
diff --git a/wherehows-web/app/templates/components/datasets/urn-breadcrumbs.hbs b/wherehows-web/app/templates/components/datasets/urn-breadcrumbs.hbs
index 572ed9085e..e1c52e162c 100644
--- a/wherehows-web/app/templates/components/datasets/urn-breadcrumbs.hbs
+++ b/wherehows-web/app/templates/components/datasets/urn-breadcrumbs.hbs
@@ -19,7 +19,7 @@
         (query-params page=1 prefix=crumb.prefix platform=crumb.platform)
         class="nacho-breadcrumbs__crumb__grain"}}
 
-        <span class="nacho-breadcrumbs__crumb__text">
+        <span class="nacho-breadcrumbs__crumb__text" title="{{crumb.crumb}}">
           {{split-text crumb.crumb 18}}
         </span>
 
diff --git a/wherehows-web/app/templates/components/more-info.hbs b/wherehows-web/app/templates/components/more-info.hbs
index 53f55b42b3..50da02ec20 100644
--- a/wherehows-web/app/templates/components/more-info.hbs
+++ b/wherehows-web/app/templates/components/more-info.hbs
@@ -1,7 +1,7 @@
 <a {{action "click" preventDefault=false}} target={{target}} href={{link}}>
   <sup>
     {{#if tooltip}}
-      <i title="{{tooltip}}" class="nacho-tooltip">
+      <i class="nacho-tooltip">
         More Info
       </i>
     {{else}}
diff --git a/wherehows-web/app/utils/validators/urn.ts b/wherehows-web/app/utils/validators/urn.ts
index 8394f2b224..4e1575c5b4 100644
--- a/wherehows-web/app/utils/validators/urn.ts
+++ b/wherehows-web/app/utils/validators/urn.ts
@@ -68,24 +68,6 @@ const getPlatformFromUrn = (candidateUrn: string) => {
   }
 };
 
-/**
- * Extracts the fabric string from a LI (internal) dataset urn
- * @param {string} urn
- * @return {Fabric | void}
- */
-const getFabricFromUrn = (urn: string): Fabric | void => {
-  const matches = datasetUrnRegexLI.exec(urn);
-
-  if (matches) {
-    let [, , , fabric] = matches;
-    fabric = fabric.toUpperCase();
-
-    if (isDatasetFabric(fabric)) {
-      return fabric;
-    }
-  }
-};
-
 /**
  * Extracts the constituent parts of a datasystem / dataset urn
  * @param {string} urn
@@ -226,7 +208,6 @@ export {
   buildLiUrn,
   specialFlowUrnRegex,
   getPlatformFromUrn,
-  getFabricFromUrn,
   getUrnParts,
   convertWhUrnToLiUrn,
   convertWhDatasetPathToLiPath,