diff --git a/packages/builder/package.json b/packages/builder/package.json
index 801c25cce6..25bd859898 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -73,7 +73,6 @@
     "deepmerge": "^4.2.2",
     "fast-sort": "^2.2.0",
     "feather-icons": "^4.21.0",
-    "flatpickr": "^4.6.6",
     "lodash": "^4.17.13",
     "mustache": "^4.0.1",
     "posthog-js": "1.3.1",
diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js
index e90724758b..bb6fe58963 100644
--- a/packages/builder/rollup.config.js
+++ b/packages/builder/rollup.config.js
@@ -11,7 +11,6 @@ import copy from "rollup-plugin-copy"
 import css from "rollup-plugin-css-only"
 import replace from "rollup-plugin-replace"
 import json from "@rollup/plugin-json"
-import fs from "fs"
 
 import path from "path"
 
diff --git a/packages/builder/src/components/common/DatePicker.svelte b/packages/builder/src/components/common/DatePicker.svelte
index 6cb5bfccff..c6641cd6a2 100644
--- a/packages/builder/src/components/common/DatePicker.svelte
+++ b/packages/builder/src/components/common/DatePicker.svelte
@@ -1,21 +1,39 @@
 <script>
   import Flatpickr from "svelte-flatpickr"
   import { Label, Input } from "@budibase/bbui"
-  import 'flatpickr/dist/flatpickr.css'
-
-  const PICKER_OPTIONS = {
-    enableTime: true
-  }
+  import "flatpickr/dist/flatpickr.css"
 
   export let label
   export let value
+
+  const PICKER_OPTIONS = {
+    enableTime: true,
+    // element: "#date-picker"
+  }
+
 </script>
 
 <div class="bb-margin-m">
   <Label small forAttr={'datepicker-label'}>{label}</Label>
   <Flatpickr 
-    options={PICKER_OPTIONS}
     placeholder={label}
+    options={PICKER_OPTIONS}
     bind:value
   />
-</div>
\ No newline at end of file
+</div>
+
+<style>
+  :global(.flatpickr-input) {
+    width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
+    color: var(--ink);
+    border-radius: 5px;
+    border: none;
+    background-color: var(--grey-2);
+    padding: var(--spacing-m);
+    font-size: var(--font-size-xs);
+    margin: 0;
+    outline-color: var(--blue);
+  }
+</style>
\ No newline at end of file
diff --git a/packages/builder/src/index.html b/packages/builder/src/index.html
index b892846186..150d9e23b9 100644
--- a/packages/builder/src/index.html
+++ b/packages/builder/src/index.html
@@ -8,8 +8,6 @@
 	<title>Budibase Builder</title>
 
 	<link href="https://cdn.jsdelivr.net/npm/remixicon@2.3.0/fonts/remixicon.css" rel="stylesheet">
-	<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css"> -->
-
   
 	<link rel='icon' type='image/png' href='/_builder/favicon.png'>
 	<link rel='stylesheet' href='/_builder/bundle.css'>
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 7020cefcd5..9931e257f6 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -2957,7 +2957,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-flatpickr@^4.5.2, flatpickr@^4.6.6:
+flatpickr@^4.5.2:
   version "4.6.6"
   resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.6.tgz#34d2ad80adfa34254e62583a34264d472f1038d6"
   integrity sha512-EZ48CJMttMg3maMhJoX+GvTuuEhX/RbA1YeuI19attP3pwBdbYy6+yqAEVm0o0hSBFYBiLbVxscLW6gJXq6H3A==
diff --git a/packages/server/src/api/controllers/record.js b/packages/server/src/api/controllers/record.js
index 49b38e9691..dec47b5d09 100644
--- a/packages/server/src/api/controllers/record.js
+++ b/packages/server/src/api/controllers/record.js
@@ -3,17 +3,12 @@ const validateJs = require("validate.js")
 const newid = require("../../db/newid")
 
 validateJs.extend(validateJs.validators.datetime, {
-  // The value is guaranteed not to be null or undefined but otherwise it
-  // could be anything.
   parse: function(value, options) {
-    // return +moment.utc(value);
     return new Date(value).getTime()
   },
   // Input is a unix timestamp
   format: function(value, options) {
     return new Date(value).toISOString()
-    // var format = options.dateOnly ? "YYYY-MM-DD" : "YYYY-MM-DD hh:mm:ss";
-    // return moment.utc(value).format(format);
   }
 });