diff --git a/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.old.svelte b/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.old.svelte
deleted file mode 100644
index 1491f7878f..0000000000
--- a/packages/builder/src/components/database/ModelDataTable/modals/RecordFieldControl.old.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-<script>
-  import Select from "../../../common/Select.svelte"
-
-  export let record
-  export let field
-  export let errors
-
-  $: isDropdown =
-    field.type === "string" &&
-    field.typeOptions.values &&
-    field.typeOptions.values.length > 0
-
-  $: isNumber = field.type === "number"
-
-  $: isText = field.type === "string" && !isDropdown
-
-  $: isCheckbox = field.type === "bool"
-
-  $: isError = errors && errors.some(e => e.field && e.field === field.name)
-
-  $: isDatetime = field.type === "datetime"
-</script>
-
-<div class="uk-margin">
-  {#if !isCheckbox}
-    <label class="uk-form-label" for={field.name}>{field.label}</label>
-  {/if}
-  <div class="uk-form-controls">
-    {#if isDropdown}
-      <Select bind:value={record[field.name]}>
-        <option value="" />
-        {#each field.typeOptions.values as val}
-          <option value={val}>{val}</option>
-        {/each}
-      </Select>
-    {:else if isText}
-      <input
-        class="uk-input"
-        class:uk-form-danger={isError}
-        id={field.name}
-        type="text"
-        bind:value={record[field.name]} />
-    {:else if isNumber}
-      <input
-        class="uk-input"
-        class:uk-form-danger={isError}
-        type="number"
-        bind:value={record[field.name]} />
-    {:else if isDatetime}
-      <input
-        class="uk-input"
-        class:uk-form-danger={isError}
-        type="date"
-        bind:value={record[field.name]} />
-    {:else if isCheckbox}
-      <label>
-        <input
-          class="uk-checkbox"
-          class:uk-form-danger={isError}
-          type="checkbox"
-          bind:checked={record[field.name]} />
-        {field.label}
-      </label>
-    {/if}
-  </div>
-</div>
diff --git a/packages/cli/src/common.js b/packages/cli/src/common.js
index 5e3fcc03a0..b922a5d8b8 100644
--- a/packages/cli/src/common.js
+++ b/packages/cli/src/common.js
@@ -4,18 +4,5 @@ const { homedir } = require("os")
 module.exports.serverFileName = relativePath =>
   resolve(__dirname, "..", "node_modules", "@budibase", "server", relativePath)
 
-// module.exports.getAppContext = async ({ configName, masterIsCreated }) => {
-//   if (configName) {
-//     if (!configName.endsWith(".js")) {
-//       configName = `config.${configName}.js`
-//     }
-//   } else {
-//     configName = "config.js"
-//   }
-
-//   const config = require(resolve(cwd(), configName))()
-//   return await buildAppContext(config, masterIsCreated)
-// }
-
 module.exports.xPlatHomeDir = dir =>
   dir.startsWith("~") ? join(homedir(), dir.substring(1)) : dir