diff --git a/packages/builder/src/userInterface/PropertyCascader.svelte b/packages/builder/src/userInterface/PropertyCascader.svelte
index 85948c6688..c900bb2276 100644
--- a/packages/builder/src/userInterface/PropertyCascader.svelte
+++ b/packages/builder/src/userInterface/PropertyCascader.svelte
@@ -3,43 +3,17 @@
   import { store } from "../builderStore";
   import { isBinding, getBinding, setBinding } from "../common/binding";
 
-  export let value = "";
   export let onChanged = () => {};
-  export let type = "";
+  export let value = "";
 
   let isOpen = false;
   let stateBindings = [];
 
-  let isBound = false;
   let bindingPath = "";
   let bindingFallbackValue = "";
   let bindingSource = "store";
-  let isExpanded = false;
-  let forceIsBound = false;
-  let canOnlyBind = false;
 
-  $: {
-    canOnlyBind = type === "state";
-    if (!forceIsBound && canOnlyBind) forceIsBound = true;
-
-    isBound = forceIsBound || isBinding(value);
-
-    if (isBound) {
-      const binding = getBinding(value);
-      bindingPath = binding.path;
-      bindingFallbackValue = binding.fallback;
-      bindingSource = binding.source || "store";
-    } else {
-      bindingPath = "";
-      bindingFallbackValue = "";
-      bindingSource = "store";
-    }
-  }
-
-  const clearBinding = () => {
-    forceIsBound = false;
-    onChanged("");
-  };
+  const clearBinding = () => onChanged("");
 
   const bind = (path, fallback, source) => {
     if (!path) {
@@ -50,10 +24,8 @@
     onChanged(binding);
   };
 
-  const setBindingPath = value => {
-    forceIsBound = canOnlyBind;
+  const setBindingPath = value =>
     bind(value, bindingFallbackValue, bindingSource);
-  };
 
   const setBindingFallback = value => bind(bindingPath, value, bindingSource);
 
@@ -61,10 +33,15 @@
     bind(bindingPath, bindingFallbackValue, value);
 
   $: {
+
+    const binding = getBinding(value);
+    bindingPath = binding.path
+    bindingFallbackValue = binding.fallback
+
     console.log({
       bindingFallbackValue,
       bindingPath,
-      value
+      value,
     });
 
     const currentScreen = $store.screens.find(
@@ -79,9 +56,9 @@
     <input
       class="uk-input uk-form-small"
       value={bindingFallbackValue}
-      on:change={e => { 
-        setBindingFallback(e.target.value)
-      }}/>
+      on:change={e => {
+        setBindingFallback(e.target.value);
+      }} />
     <button on:click={() => (isOpen = !isOpen)}>
       <span
         class="icon"
diff --git a/packages/builder/src/userInterface/StateBindingControl.svelte b/packages/builder/src/userInterface/StateBindingControl.svelte
index 7d548c59de..c2a0e2d30f 100644
--- a/packages/builder/src/userInterface/StateBindingControl.svelte
+++ b/packages/builder/src/userInterface/StateBindingControl.svelte
@@ -28,11 +28,7 @@
       {/each}
     </select>
   {:else}
-    <PropertyCascader 
-      {onChanged}
-      {type}
-      on:change={ev => onChanged(ev.target.value)} 
-    />
+    <PropertyCascader {onChanged} {value} />
   {/if}
 </div>
 
diff --git a/packages/client/src/state/stateBinding.js b/packages/client/src/state/stateBinding.js
index dd002dcfeb..e684a024af 100644
--- a/packages/client/src/state/stateBinding.js
+++ b/packages/client/src/state/stateBinding.js
@@ -146,7 +146,6 @@ export const setupBinding = (store, rootProps, coreApi, context, rootPath) => {
           }
 
           newProps[boundHandler.propName] = async context => {
-            console.log(closuredHandlers);
             for (let runHandler of closuredHandlers) {
               await runHandler(context)
             }