diff --git a/packages/backend-core/src/index.js b/packages/backend-core/src/index.js
index 3868d9bffa..572b61fbeb 100644
--- a/packages/backend-core/src/index.js
+++ b/packages/backend-core/src/index.js
@@ -19,5 +19,6 @@ module.exports = {
   env: require("./environment"),
   accounts: require("./cloud/accounts"),
   tenancy: require("./tenancy"),
+  context: require("../context"),
   featureFlags: require("./featureFlags"),
 }
diff --git a/packages/builder/src/components/billing/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte
similarity index 100%
rename from packages/builder/src/components/billing/Usage.svelte
rename to packages/builder/src/components/usage/Usage.svelte
diff --git a/packages/builder/src/pages/builder/portal/settings/usage.svelte b/packages/builder/src/pages/builder/portal/settings/usage.svelte
index 71b1d4255e..069c37b555 100644
--- a/packages/builder/src/pages/builder/portal/settings/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/usage.svelte
@@ -9,7 +9,7 @@
   } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { admin, auth, licensing } from "stores/portal"
-  import Usage from "components/billing/Usage.svelte"
+  import Usage from "components/usage/Usage.svelte"
 
   let staticUsage = []
   let monthlyUsage = []
@@ -17,7 +17,6 @@
 
   $: quotaUsage = $licensing.quotaUsage
   $: license = $auth.user?.license
-  $: console.log($auth.user)
 
   const upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`