diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js
index 1cb21a9941..c6b2995db5 100644
--- a/packages/builder/src/builderStore/api.js
+++ b/packages/builder/src/builderStore/api.js
@@ -20,15 +20,11 @@ export const get = apiCall("GET")
 export const patch = apiCall("PATCH")
 export const del = apiCall("DELETE")
 export const put = apiCall("PUT")
-// export const getBuilderCookie = async () => {
-//   await post("/api/builder/login", {})
-// }
 
 export default {
   post: apiCall("POST"),
   get: apiCall("GET"),
   patch: apiCall("PATCH"),
   delete: apiCall("DELETE"),
-  put: apiCall("PUT"),
-  // getBuilderCookie,
+  put: apiCall("PUT")
 }
diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index 25e3c5979b..6fecda84c0 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -6,7 +6,6 @@ import { derived, writable } from "svelte/store"
 import analytics from "analytics"
 import { FrontendTypes, LAYOUT_NAMES } from "../constants"
 import { findComponent } from "./storeUtils"
-// import { getBuilderCookie } from "./api"
 
 export const store = getFrontendStore()
 export const automationStore = getAutomationStore()
@@ -58,8 +57,6 @@ export const selectedAccessRole = writable("BASIC")
 
 export const initialise = async () => {
   try {
-    // TODO this needs to be replaced by a real login
-    // await getBuilderCookie()
     await analytics.activate()
     analytics.captureEvent("Builder Started")
   } catch (err) {
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index fd1d7a6688..14cd5586c6 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -1,6 +1,5 @@
 const CouchDB = require("../../db")
 const env = require("../../environment")
-const setBuilderToken = require("../../utilities/builder/setBuilderToken")
 const packageJson = require("../../../package.json")
 const {
   createLinkView,
@@ -145,7 +144,6 @@ exports.fetchAppPackage = async function(ctx) {
     layouts,
     clientLibPath: clientLibraryPath(ctx.params.appId),
   }
-  // await setBuilderToken(ctx, ctx.params.appId, application.version)
 }
 
 exports.create = async function(ctx) {
@@ -184,7 +182,6 @@ exports.create = async function(ctx) {
     await createApp(appId)
   }
 
-  // await setBuilderToken(ctx, appId, version)
   ctx.status = 200
   ctx.body = newApplication
   ctx.message = `Application ${ctx.request.body.name} created successfully`
diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js
index dd60ee5985..d503d5dd2f 100644
--- a/packages/server/src/api/controllers/static/index.js
+++ b/packages/server/src/api/controllers/static/index.js
@@ -34,9 +34,6 @@ const COMP_LIB_BASE_APP_VERSION = "0.2.5"
 
 exports.serveBuilder = async function(ctx) {
   let builderPath = resolve(TOP_LEVEL_PATH, "builder")
-  // if (ctx.file === "index.html") {
-  //   // await setBuilderToken(ctx)
-  // }
   await send(ctx, ctx.file, { root: builderPath })
 }