diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte
index c7a500372f..43240684c1 100644
--- a/packages/bbui/src/Form/Core/EnvDropdown.svelte
+++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte
@@ -3,8 +3,6 @@
   import { createEventDispatcher, onMount } from "svelte"
   import clickOutside from "../../Actions/click_outside"
   import Divider from "../../Divider/Divider.svelte"
-  import Tag from "../../Tags/Tag.svelte"
-  import Tags from "../../Tags/Tags.svelte"
 
   export let value = null
   export let placeholder = null
@@ -31,7 +29,7 @@
   const STRIP_NAME_REGEX = /(?<=\.)(.*?)(?=\ })/g
 
   // Strips the name out of the value which is {{ env.Variable }} resulting in an array like ["Variable"]
-  $: tags = String(value)?.match(STRIP_NAME_REGEX) || []
+  $: hbsValue = String(value)?.match(STRIP_NAME_REGEX) || []
 
   const updateValue = newValue => {
     if (readonly) {
@@ -87,42 +85,46 @@
     focus = autofocus
     if (focus) field.focus()
   })
+
+  function removeVariable() {
+    updateValue("")
+  }
+
+  function openPopover() {
+    open = true
+    focus = true
+    iconFocused = true
+  }
 </script>
 
 <div class="spectrum-InputGroup">
-  <div class:is-focused={focus} class="spectrum-Textfield ">
+  <div
+    class:is-disabled={disabled || hbsValue.length}
+    class:is-focused={focus}
+    class="spectrum-Textfield "
+  >
     <svg
+      class:close-color={hbsValue.length}
       class:focused={iconFocused}
-      class="hoverable icon-position spectrum-Icon spectrum-Icon--sizeM spectrum-Textfield-validationIcon"
+      class="hoverable icon-position spectrum-Icon spectrum-Icon--sizeS spectrum-Textfield-validationIcon"
       focusable="false"
       aria-hidden="true"
       on:click={() => {
-        open = true
-        focus = true
-        iconFocused = true
+        hbsValue.length ? removeVariable() : openPopover()
       }}
     >
-      <use xlink:href="#spectrum-icon-18-Key" />
+      <use
+        xlink:href={`#spectrum-icon-18-${!hbsValue.length ? "Key" : "Close"}`}
+      />
     </svg>
-    <Tags>
-      <div class="tags">
-        <div class="tag">
-          {#each tags as tag}
-            <Tag closable on:click={() => updateValue("")}>
-              {tag}
-            </Tag>
-          {/each}
-        </div>
-      </div>
-    </Tags>
 
     <input
       bind:this={field}
-      {disabled}
+      disabled={false}
       {readonly}
-      {id}
+      id={"thisOne"}
       data-cy={dataCy}
-      value={!tags.length ? value : ""}
+      value={hbsValue.length ? `{{ ${hbsValue[0]} }}` : value}
       placeholder={placeholder || ""}
       on:click
       on:blur
@@ -133,8 +135,8 @@
       on:focus={onFocus}
       on:input={onInput}
       {type}
+      style="color: white !important;"
       class="spectrum-Textfield-input"
-      style={align ? `text-align: ${align};` : ""}
       inputmode={type === "number" ? "decimal" : "text"}
     />
   </div>
@@ -220,7 +222,7 @@
 
   .icon-position {
     position: absolute;
-    top: 20%;
+    top: 25%;
     right: 2%;
   }
 
@@ -275,9 +277,11 @@
     background: var(--grey-1);
   }
 
-  .tags {
-    position: absolute;
-    bottom: 12%;
-    left: 1px;
+  .close-color {
+    color: var(--spectrum-global-color-gray-900) !important;
+  }
+
+  .close-color:hover {
+    color: var(--spectrum-global-color-blue-400) !important;
   }
 </style>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 45dc75a1fe..47cf2957d1 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -87,7 +87,6 @@
 
   function showModal(configKey) {
     selectedKey = configKey
-    console.log(selectedKey)
     createVariableModal.show()
   }
 
@@ -103,8 +102,6 @@
       await licensing.init()
     }
   })
-
-  $: console.log(config)
 </script>
 
 <form>
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index ae4cf60d4c..d995bd507b 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -122,7 +122,6 @@
 
   // Adds a data binding to the expression
   const addBinding = (binding, { forceJS } = {}) => {
-    console.log(binding)
     if (usingJS || forceJS) {
       let js = decodeJSBinding(jsValue)
       js = addJSBinding(js, getCaretPosition(), binding.readableBinding)