diff --git a/ayanova/src/components/date-native-control.vue b/ayanova/src/components/date-native-control.vue
deleted file mode 100644
index 26930777..00000000
--- a/ayanova/src/components/date-native-control.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div>
-    <template v-if="!readonly">
-      <v-text-field
-        ref="dateField"
-        :value="dateValue"
-        @change="updateValue()"
-        :readonly="readonly"
-        :disabled="disabled"
-        :label="label"
-        :rules="rules"
-        type="date"
-        :error-messages="errorMessages"
-        :data-cy="'dateinput:' + testId"
-      ></v-text-field>
-    </template>
-    <template v-else>
-      <v-text-field
-        :value="readonlyFormat()"
-        :label="label"
-        readonly
-      ></v-text-field>
-    </template>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      timeZoneName: window.$gz.locale.getResolvedTimeZoneName()
-    };
-  },
-  props: {
-    label: { type: String, default: null },
-    rules: { type: Array, default: undefined },
-    errorMessages: { type: Array, default: null },
-    value: { type: String, default: null },
-    readonly: { type: Boolean, default: false },
-    disabled: { type: Boolean, default: false },
-    testId: { type: String, default: null }
-  },
-  computed: {
-    dateValue() {
-      return window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
-        this.value,
-        this.timeZoneName
-      );
-    }
-  },
-  methods: {
-    readonlyFormat() {
-      return window.$gz.locale.utcDateToShortDateLocalized(
-        this.internalValue,
-        this.timeZoneName,
-        this.languageName,
-        this.hour12
-      );
-    },
-    updateValue() {
-      const vm = this;
-      let dateValue = vm.$refs.dateField.$refs.input.value;
-      if (!dateValue) {
-        const v = new Date();
-        const fullYear = v.getFullYear();
-        let fullMonth = v.getMonth() + 1;
-        if (fullMonth < 10) {
-          fullMonth = "0" + fullMonth.toString();
-        }
-        let fullDay = v.getDate();
-        if (fullDay < 10) {
-          fullDay = "0" + fullDay.toString();
-        }
-        dateValue = fullYear + "-" + fullMonth + "-" + fullDay;
-      }
-
-      let timeValue = window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(
-        vm.value,
-        vm.timeZoneName
-      );
-      if (!timeValue) {
-        timeValue = "00:00:00";
-      }
-
-      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
-        dateValue + "T" + timeValue,
-        vm.timeZoneName
-      );
-      vm.$emit("input", ret);
-    }
-  }
-};
-</script>
diff --git a/ayanova/src/components/date-time-native-control.vue b/ayanova/src/components/date-time-native-control.vue
deleted file mode 100644
index 6e85efa9..00000000
--- a/ayanova/src/components/date-time-native-control.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <v-row>
-    <template v-if="!readonly">
-      <v-col cols="6">
-        <v-text-field
-          ref="dateField"
-          :value="splitValue.date"
-          @change="updateValue()"
-          :readonly="readonly"
-          :disabled="disabled"
-          :label="label"
-          :rules="rules"
-          type="date"
-          :error-messages="errorMessages"
-          :data-cy="'dateinput:' + testId"
-        ></v-text-field>
-      </v-col>
-      <v-col cols="6">
-        <v-text-field
-          ref="timeField"
-          :value="splitValue.time"
-          @change="updateValue()"
-          :readonly="readonly"
-          :disabled="disabled"
-          type="time"
-          :data-cy="'timeinput:' + testId"
-        ></v-text-field>
-      </v-col>
-    </template>
-    <template v-else>
-      <v-text-field
-        :value="readonlyFormat()"
-        :label="label"
-        readonly
-        prepend-icon="$ayiCalendarAlt"
-      ></v-text-field>
-    </template>
-  </v-row>
-</template>
-<script>
-//==========================================
-//==========================================
-export default {
-  data() {
-    return {
-      timeZoneName: window.$gz.locale.getResolvedTimeZoneName()
-    };
-  },
-
-  props: {
-    label: { type: String, default: null },
-    rules: { type: Array, default: undefined },
-    errorMessages: { type: Array, default: null },
-    value: { type: String, default: null },
-    readonly: { type: Boolean, default: false },
-    disabled: { type: Boolean, default: false },
-    testId: { type: String, default: null }
-  },
-  computed: {
-    splitValue() {
-      return {
-        date: window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
-          this.value,
-          this.timeZoneName
-        ),
-        time: window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(
-          this.value,
-          this.timeZoneName
-        )
-      };
-    }
-  },
-  methods: {
-    readonlyFormat() {
-      return window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-        this.value,
-        this.timeZoneName,
-        this.languageName,
-        this.hour12
-      );
-    },
-    updateValue() {
-      const vm = this;
-      let dateValue = vm.$refs.dateField.$refs.input.value;
-      if (!dateValue) {
-        const v = new Date();
-        const fullYear = v.getFullYear();
-        let fullMonth = v.getMonth() + 1;
-        if (fullMonth < 10) {
-          fullMonth = "0" + fullMonth.toString();
-        }
-        let fullDay = v.getDate();
-        if (fullDay < 10) {
-          fullDay = "0" + fullDay.toString();
-        }
-        dateValue = fullYear + "-" + fullMonth + "-" + fullDay;
-      }
-
-      let timeValue = vm.$refs.timeField.$refs.input.value;
-      if (!timeValue) {
-        timeValue = "00:00:00";
-      }
-
-      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
-        dateValue + "T" + timeValue,
-        vm.timeZoneName
-      );
-      vm.$emit("input", ret);
-    }
-  }
-};
-</script>
diff --git a/ayanova/src/components/time-native-control.vue b/ayanova/src/components/time-native-control.vue
deleted file mode 100644
index feeaa8a8..00000000
--- a/ayanova/src/components/time-native-control.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-  <div>
-    <template v-if="!readonly">
-      <v-text-field
-        ref="timeField"
-        :value="timeValue"
-        @change="updateValue()"
-        :readonly="readonly"
-        :disabled="disabled"
-        :label="label"
-        :rules="rules"
-        :error-messages="errorMessages"
-        type="time"
-        :data-cy="'timeinput:' + testId"
-      ></v-text-field>
-    </template>
-    <template v-else>
-      <v-text-field
-        :value="readonlyFormat()"
-        :label="label"
-        readonly
-      ></v-text-field>
-    </template>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      timeZoneName: window.$gz.locale.getResolvedTimeZoneName()
-    };
-  },
-  props: {
-    label: { type: String, default: null },
-    rules: { type: Array, default: undefined },
-    errorMessages: { type: Array, default: null },
-    value: { type: String, default: null },
-    readonly: { type: Boolean, default: false },
-    disabled: { type: Boolean, default: false },
-    testId: { type: String, default: null }
-  },
-  computed: {
-    timeValue() {
-      return window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(
-        this.value,
-        this.timeZoneName
-      );
-    }
-  },
-  methods: {
-    readonlyFormat() {
-      return window.$gz.locale.utcDateToShortTimeLocalized(
-        this.value,
-        this.timeZoneName,
-        this.languageName,
-        this.hour12
-      );
-    },
-    updateValue() {
-      let dateValue = window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
-        this.value,
-        this.timeZoneName
-      );
-      if (!dateValue) {
-        const v = new Date();
-        const fullYear = v.getFullYear();
-        let fullMonth = v.getMonth() + 1;
-        if (fullMonth < 10) {
-          fullMonth = "0" + fullMonth.toString();
-        }
-        let fullDay = v.getDate();
-        if (fullDay < 10) {
-          fullDay = "0" + fullDay.toString();
-        }
-        dateValue = fullYear + "-" + fullMonth + "-" + fullDay;
-      }
-      let timeValue = this.$refs.timeField.$refs.input.value;
-      if (!timeValue) {
-        timeValue = "00:00:00";
-      }
-      const ret = window.$gz.locale.localTimeDateStringToUTC8601String(
-        dateValue + "T" + timeValue,
-        this.timeZoneName
-      );
-      this.$emit("input", ret);
-    }
-  }
-};
-</script>