diff --git a/apps/api/src/demo/demo.service.ts b/apps/api/src/demo/demo.service.ts
index 73a7136e0..854a6210f 100644
--- a/apps/api/src/demo/demo.service.ts
+++ b/apps/api/src/demo/demo.service.ts
@@ -9,7 +9,7 @@ import happinessQuestionnaire from '@opendatacapture/instrument-library/forms/DN
 import breakoutTask from '@opendatacapture/instrument-library/interactive/DNP_BREAKOUT_TASK.js';
 import happinessQuestionnaireWithConsent from '@opendatacapture/instrument-library/series/DNP_HAPPINESS_QUESTIONNAIRE_WITH_CONSENT.js';
 import type { FormInstrument } from '@opendatacapture/runtime-core';
-import type { Json, Language, WithID } from '@opendatacapture/schemas/core';
+import type { Language, WithID } from '@opendatacapture/schemas/core';
 import type { Group } from '@opendatacapture/schemas/group';
 import { encodeScopedSubjectId, generateSubjectHash } from '@opendatacapture/subject-utils';
 
diff --git a/apps/web/src/routes/_app/user.tsx b/apps/web/src/routes/_app/user.tsx
index ccb4dca8f..2cda70c64 100644
--- a/apps/web/src/routes/_app/user.tsx
+++ b/apps/web/src/routes/_app/user.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable perfectionist/sort-objects */
 import { useMemo } from 'react';
 
 import { estimatePasswordStrength } from '@douglasneuroinformatics/libpasswd';
@@ -63,10 +64,10 @@ const RouteComponent = () => {
       .object({
         email: z.union([z.literal(''), z.email()]).optional(),
         firstName: z.string().min(1).optional(),
-        // eslint-disable-next-line perfectionist/sort-objects
+
         dateOfBirth: z.date().optional(),
         lastName: z.string().min(1).optional(),
-        // eslint-disable-next-line perfectionist/sort-objects
+
         confirmPassword: z.string().min(1).optional(),
         password: z.string().min(1).optional(),
         phoneNumber: z.union([z.literal(''), z.string().regex(PHONE_REGEX)]).optional(),
@@ -129,13 +130,11 @@ const RouteComponent = () => {
                 label: t('common.password'),
                 variant: 'password'
               },
-              // eslint-disable-next-line perfectionist/sort-objects
               confirmPassword: {
                 kind: 'string',
                 label: t('common.confirmPassword'),
                 variant: 'password'
               },
-              // eslint-disable-next-line perfectionist/sort-objects
               email: {
                 kind: 'string',
                 label: t({
diff --git a/apps/web/src/utils/upload.ts b/apps/web/src/utils/upload.ts
index a520e37e5..d66492314 100644
--- a/apps/web/src/utils/upload.ts
+++ b/apps/web/src/utils/upload.ts
@@ -497,7 +497,7 @@ export namespace Zod3 {
         date: z3.coerce.date(),
         subjectID: z3.string().regex(SUBJECT_ID_REGEX)
       });
-      shape = (instrumentSchemaWithInternal._def as z3.ZodObjectDef).shape() as { [key: string]: z3.ZodTypeAny };
+      shape = (instrumentSchemaWithInternal._def as z3.ZodObjectDef).shape();
     } else {
       instrumentSchemaWithInternal = instrumentSchema.extend({
         date: z3.coerce.date(),
@@ -621,7 +621,7 @@ export namespace Zod3 {
               })
             );
           }
-          result.push(zodCheck.data as FormTypes.Data);
+          result.push(zodCheck.data);
           rowNumber++;
         }
         return resolve(result);