diff --git a/src/pages/dataSetsWip/form/DataSetFormContents.tsx b/src/pages/dataSetsWip/form/DataSetFormContents.tsx
index 73ba49ce..8c7a82eb 100644
--- a/src/pages/dataSetsWip/form/DataSetFormContents.tsx
+++ b/src/pages/dataSetsWip/form/DataSetFormContents.tsx
@@ -6,13 +6,13 @@ import {
 } from '../../../lib'
 import { AdvancedFormContents } from './AdvancedFormContents'
 import { DataFormContents } from './DataFormContents'
+import { DataSetFormValues } from './dataSetFormSchema'
 import { DataSetFormDescriptor } from './formDescriptor'
 import { FormFormContents } from './FormFormContents'
 import { OrganisationUnitsFormContents } from './OrganisationUnitsFormContents'
 import { PeriodsContents } from './PeriodsFormContents'
 import { SetupFormContents } from './SetupFormContents'
 import { ValidationFormContents } from './ValidationFormContents'
-import { DataSetFormValues } from './dataSetFormSchema'
 
 export const DataSetFormContents = ({
     formValues,
diff --git a/src/pages/dataSetsWip/form/HiddenInputField.tsx b/src/pages/dataSetsWip/form/HiddenInputField.tsx
index ae3a5595..8a07186e 100644
--- a/src/pages/dataSetsWip/form/HiddenInputField.tsx
+++ b/src/pages/dataSetsWip/form/HiddenInputField.tsx
@@ -1,10 +1,11 @@
-import React, { useState } from 'react'
-import { Checkbox, InputFieldFF } from '@dhis2/ui'
-import { FieldMetaState, FieldRenderProps, useField } from 'react-final-form'
 import i18n from '@dhis2/d2-i18n'
-import classes from './HiddenInputField.module.css'
-import { InputFieldRestProps } from '@dhis2/ui-forms/types/InputFieldFF/InputFieldFF'
 import type { InputFieldProps } from '@dhis2-ui/input'
+import { Checkbox, InputFieldFF } from '@dhis2/ui'
+import React, { useState } from 'react'
+import { FieldMetaState, useField } from 'react-final-form'
+import classes from './HiddenInputField.module.css'
+
+type InputFieldRestProps = Omit<InputFieldProps, 'onChange' | 'value' | 'name'>
 
 export type HiddenInputFieldProps = InputFieldRestProps & {
     fieldName: string
diff --git a/src/pages/dataSetsWip/form/PeriodsFormContents.tsx b/src/pages/dataSetsWip/form/PeriodsFormContents.tsx
index ff49abc4..6bb5a230 100644
--- a/src/pages/dataSetsWip/form/PeriodsFormContents.tsx
+++ b/src/pages/dataSetsWip/form/PeriodsFormContents.tsx
@@ -6,10 +6,10 @@ import {
     StandardFormSectionTitle,
 } from '../../../components'
 import { SectionedFormSection } from '../../../components/sectionedForm'
-import { PeriodTypeField } from './PeriodTypeField'
-import { HiddenInputField } from './HiddenInputField'
 import { DEFAULT_CATEGORY_COMBO } from '../../../lib'
 import { DataSetFormValues } from './dataSetFormSchema'
+import { HiddenInputField } from './HiddenInputField'
+import { PeriodTypeField } from './PeriodTypeField'
 
 export const PeriodsContents = ({
     name,
diff --git a/src/pages/dataSetsWip/form/dataSetFormSchema.ts b/src/pages/dataSetsWip/form/dataSetFormSchema.ts
index 2374f485..b136a13d 100644
--- a/src/pages/dataSetsWip/form/dataSetFormSchema.ts
+++ b/src/pages/dataSetsWip/form/dataSetFormSchema.ts
@@ -1,3 +1,4 @@
+import i18n from '@dhis2/d2-i18n'
 import { z } from 'zod'
 import {
     DEFAULT_CATEGORY_COMBO,
@@ -5,7 +6,6 @@ import {
     modelFormSchemas,
 } from '../../../lib'
 import { createFormValidate } from '../../../lib/form/validate'
-import i18n from '@dhis2/d2-i18n'
 
 const { withAttributeValues, identifiable, style, referenceCollection } =
     modelFormSchemas