diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
index ae6fee5345..3c4678d3ef 100644
--- a/packages/builder/src/builderStore/store/index.js
+++ b/packages/builder/src/builderStore/store/index.js
@@ -93,7 +93,7 @@ const setPackage = (store, initial) => async pkg => {
     },
   }
 
-  initial.libraries = await fetchComponentLibModules(pkg.application)
+  initial.libraries = pkg.application.componentLibraries;
   initial.components = await fetchComponentLibDefinitions(pkg.application._id)
   initial.appname = pkg.application.name
   initial.appId = pkg.application._id
diff --git a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte
index 5e68f2e4f0..a1ceac9eeb 100644
--- a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte
@@ -46,7 +46,7 @@
 
   $: frontendDefinition = {
     appId: $store.appId,
-    libraries: Object.keys($store.libraries),
+    libraries: $store.libraries,
     page: $store.currentPreviewItem,
     screens: screensExist
       ? $store.currentPreviewItem._screens
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
index da4834a429..eb066175ae 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
@@ -36,11 +36,6 @@
     sortBy("title"),
   ])
 
-  const isScreenSelected = component =>
-    component.component &&
-    $store.currentPreviewItem &&
-    component.component.name === $store.currentPreviewItem.name
-
   const confirmDeleteComponent = component => {
     componentToDelete = component
     confirmDeleteDialog.show()
@@ -54,6 +49,7 @@
 
 <div class="root">
 
+
   {#each _screens as screen}
     <div
       class="budibase__nav-item component"
diff --git a/packages/builder/src/components/userInterface/PageLayout.svelte b/packages/builder/src/components/userInterface/PageLayout.svelte
index 29a6c769b6..2a532f9624 100644
--- a/packages/builder/src/components/userInterface/PageLayout.svelte
+++ b/packages/builder/src/components/userInterface/PageLayout.svelte
@@ -34,11 +34,6 @@
     title: lastPartOfName(layout),
   }
 
-  const isScreenSelected = component =>
-    component.component &&
-    $store.currentPreviewItem &&
-    component.component.name === $store.currentPreviewItem.name
-
   const confirmDeleteComponent = async component => {
     componentToDelete = component
     confirmDeleteDialog.show()
diff --git a/packages/builder/src/components/userInterface/StateBindingControl.svelte b/packages/builder/src/components/userInterface/StateBindingControl.svelte
index 15ea705812..01adfeeac3 100644
--- a/packages/builder/src/components/userInterface/StateBindingControl.svelte
+++ b/packages/builder/src/components/userInterface/StateBindingControl.svelte
@@ -49,8 +49,6 @@
         {/if}
       {/each}
     </select>
-  {:else if type === 'colour'}
-    <Colorpicker {onChanged} {value} />
   {:else}
     <PropertyCascader {onChanged} {value} />
   {/if}