diff --git a/client/src/app/pages/applications/application-review/components/review-form/review-form.tsx b/client/src/app/pages/applications/application-review/components/review-form/review-form.tsx
index 912610b54a..036de067bd 100644
--- a/client/src/app/pages/applications/application-review/components/review-form/review-form.tsx
+++ b/client/src/app/pages/applications/application-review/components/review-form/review-form.tsx
@@ -12,11 +12,7 @@ import {
   NumberInput,
 } from "@patternfly/react-core";
 
-import {
-  DEFAULT_SELECT_MAX_HEIGHT,
-  PROPOSED_ACTION_LIST,
-  EFFORT_ESTIMATE_LIST,
-} from "@app/Constants";
+import { PROPOSED_ACTION_LIST, EFFORT_ESTIMATE_LIST } from "@app/Constants";
 import { number } from "yup";
 import {
   Application,
@@ -242,7 +238,7 @@ export const ReviewForm: React.FC<IReviewFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="review-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/applications/components/application-form/application-form.tsx b/client/src/app/pages/applications/components/application-form/application-form.tsx
index 2b50e3da91..cf0f91d67a 100644
--- a/client/src/app/pages/applications/components/application-form/application-form.tsx
+++ b/client/src/app/pages/applications/components/application-form/application-form.tsx
@@ -462,8 +462,9 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
                 searchInputAriaLabel="tags-select-toggle"
                 selections={
                   value
-                    .map((formTag) =>
-                      tags?.find((tagRef) => tagRef.name === formTag.name)
+                    .map(
+                      (formTag) =>
+                        tags?.find((tagRef) => tagRef.name === formTag.name)
                     )
                     .map((matchingTag) =>
                       matchingTag ? matchingTag.name : undefined
@@ -563,10 +564,11 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
                 toggleAriaLabel="contributors dropdown toggle"
                 aria-label={name}
                 value={value
-                  .map((formContributor) =>
-                    stakeholders?.find(
-                      (stakeholder) => stakeholder.name === formContributor
-                    )
+                  .map(
+                    (formContributor) =>
+                      stakeholders?.find(
+                        (stakeholder) => stakeholder.name === formContributor
+                      )
                   )
                   .map((matchingStakeholder) =>
                     matchingStakeholder
@@ -705,7 +707,7 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="application-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/applications/components/application-identity-form/application-identity-form.tsx b/client/src/app/pages/applications/components/application-identity-form/application-identity-form.tsx
index 84acf99462..55bf78180f 100644
--- a/client/src/app/pages/applications/components/application-identity-form/application-identity-form.tsx
+++ b/client/src/app/pages/applications/components/application-identity-form/application-identity-form.tsx
@@ -93,9 +93,9 @@ export const ApplicationIdentityForm: React.FC<
   );
 
   const onSubmit = (formValues: FormValues) => {
-    let updatePromises: Array<Promise<Application>> = [];
+    const updatePromises: Array<Promise<Application>> = [];
     applications.forEach((application) => {
-      let updatedIdentities: Ref[] = [];
+      const updatedIdentities: Ref[] = [];
       if (application.identities && identities) {
         const matchingSourceCredential = identities.find(
           (identity) => identity.name === formValues.sourceCredentials
@@ -249,7 +249,7 @@ export const ApplicationIdentityForm: React.FC<
       <ActionGroup>
         <Button
           type="submit"
-          id="identity-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/controls/business-services/components/business-service-form.tsx b/client/src/app/pages/controls/business-services/components/business-service-form.tsx
index b962e8f82f..36a0123244 100644
--- a/client/src/app/pages/controls/business-services/components/business-service-form.tsx
+++ b/client/src/app/pages/controls/business-services/components/business-service-form.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { AxiosError, AxiosResponse } from "axios";
 import { object, string } from "yup";
@@ -202,7 +202,7 @@ export const BusinessServiceForm: React.FC<BusinessServiceFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="business-service-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/controls/job-functions/components/job-function-form.tsx b/client/src/app/pages/controls/job-functions/components/job-function-form.tsx
index 496298552c..a2143b5140 100644
--- a/client/src/app/pages/controls/job-functions/components/job-function-form.tsx
+++ b/client/src/app/pages/controls/job-functions/components/job-function-form.tsx
@@ -144,7 +144,7 @@ export const JobFunctionForm: React.FC<JobFunctionFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="job-function-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/controls/stakeholder-groups/components/stakeholder-group-form.tsx b/client/src/app/pages/controls/stakeholder-groups/components/stakeholder-group-form.tsx
index 687b654ff3..bba35c11cb 100644
--- a/client/src/app/pages/controls/stakeholder-groups/components/stakeholder-group-form.tsx
+++ b/client/src/app/pages/controls/stakeholder-groups/components/stakeholder-group-form.tsx
@@ -160,8 +160,9 @@ export const StakeholderGroupForm: React.FC<StakeholderGroupFormProps> = ({
 
   const onSubmit = (formValues: FormValues) => {
     const matchingStakeholderRefs: Ref[] = stakeholders
-      .filter((stakeholder) =>
-        formValues?.stakeholderNames?.includes(stakeholder.name)
+      .filter(
+        (stakeholder) =>
+          formValues?.stakeholderNames?.includes(stakeholder.name)
       )
       .map((stakeholder) => {
         return {
@@ -239,7 +240,7 @@ export const StakeholderGroupForm: React.FC<StakeholderGroupFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="stakeholder-group-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/controls/stakeholders/components/stakeholder-form.tsx b/client/src/app/pages/controls/stakeholders/components/stakeholder-form.tsx
index 26b9aed6bb..70e63b93a9 100644
--- a/client/src/app/pages/controls/stakeholders/components/stakeholder-form.tsx
+++ b/client/src/app/pages/controls/stakeholders/components/stakeholder-form.tsx
@@ -159,8 +159,9 @@ export const StakeholderForm: React.FC<StakeholderFormProps> = ({
 
   const onSubmit = (formValues: FormValues) => {
     const matchingStakeholderGroupRefs: Ref[] = stakeholderGroups
-      .filter((stakeholderGroup) =>
-        formValues?.stakeholderGroupNames?.includes(stakeholderGroup.name)
+      .filter(
+        (stakeholderGroup) =>
+          formValues?.stakeholderGroupNames?.includes(stakeholderGroup.name)
       )
       .map((stakeholderGroup) => {
         return {
@@ -270,7 +271,7 @@ export const StakeholderForm: React.FC<StakeholderFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="stakeholder-form-submit"
+          id="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
         >
diff --git a/client/src/app/pages/controls/tags/components/tag-category-form.tsx b/client/src/app/pages/controls/tags/components/tag-category-form.tsx
index 967722b4d2..f2289edfc6 100644
--- a/client/src/app/pages/controls/tags/components/tag-category-form.tsx
+++ b/client/src/app/pages/controls/tags/components/tag-category-form.tsx
@@ -234,7 +234,7 @@ export const TagCategoryForm: React.FC<TagCategoryFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="tag-type-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/controls/tags/components/tag-form.tsx b/client/src/app/pages/controls/tags/components/tag-form.tsx
index 32954dc77e..44c4ae4270 100644
--- a/client/src/app/pages/controls/tags/components/tag-form.tsx
+++ b/client/src/app/pages/controls/tags/components/tag-form.tsx
@@ -181,7 +181,7 @@ export const TagForm: React.FC<TagFormProps> = ({ tag, onClose }) => {
       <ActionGroup>
         <Button
           type="submit"
-          id="tag-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
diff --git a/client/src/app/pages/external/jira/tracker-form.tsx b/client/src/app/pages/external/jira/tracker-form.tsx
index cf49f35848..bc7dcd355d 100644
--- a/client/src/app/pages/external/jira/tracker-form.tsx
+++ b/client/src/app/pages/external/jira/tracker-form.tsx
@@ -309,7 +309,7 @@ export const TrackerForm: React.FC<TrackerFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="identity-form-submit"
+          id="submit"
           variant={ButtonVariant.primary}
           isDisabled={
             !isValid || isSubmitting || isValidating || isLoading || !isDirty
diff --git a/client/src/app/pages/identities/components/identity-form/identity-form.tsx b/client/src/app/pages/identities/components/identity-form/identity-form.tsx
index 67b051b043..3b2901fa66 100644
--- a/client/src/app/pages/identities/components/identity-form/identity-form.tsx
+++ b/client/src/app/pages/identities/components/identity-form/identity-form.tsx
@@ -727,7 +727,7 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="identity-form-submit"
+          id="submit"
           variant={ButtonVariant.primary}
           isDisabled={
             !isValid || isSubmitting || isValidating || isLoading || !isDirty
diff --git a/client/src/app/pages/migration-targets/components/custom-target-form.tsx b/client/src/app/pages/migration-targets/components/custom-target-form.tsx
index 6216b48af5..e7e37f2bcc 100644
--- a/client/src/app/pages/migration-targets/components/custom-target-form.tsx
+++ b/client/src/app/pages/migration-targets/components/custom-target-form.tsx
@@ -174,7 +174,7 @@ export const CustomTargetForm: React.FC<CustomTargetFormProps> = ({
       customRulesFiles: getInitialCustomRulesFilesData(),
       rulesKind: !target
         ? "manual"
-        : !!target?.ruleset?.rules?.length
+        : target?.ruleset?.rules?.length
         ? "manual"
         : "repository",
       associatedCredentials: target?.ruleset?.identity?.name,
@@ -274,7 +274,7 @@ export const CustomTargetForm: React.FC<CustomTargetFormProps> = ({
       description: formValues?.description?.trim() || "",
       ...(formValues.imageID && { image: { id: formValues.imageID } }),
       custom: true,
-      labels: !!labels.length ? labels : [{ name: "custom", label: "custom" }],
+      labels: labels.length ? labels : [{ name: "custom", label: "custom" }],
       ruleset: {
         id: target && target.custom ? target.ruleset.id : undefined,
         name: formValues.name.trim(),
@@ -615,7 +615,7 @@ export const CustomTargetForm: React.FC<CustomTargetFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="identity-form-submit"
+          id="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
         >
diff --git a/client/src/app/pages/migration-waves/components/export-form.tsx b/client/src/app/pages/migration-waves/components/export-form.tsx
index 8fa0c50286..dc1e418632 100644
--- a/client/src/app/pages/migration-waves/components/export-form.tsx
+++ b/client/src/app/pages/migration-waves/components/export-form.tsx
@@ -282,7 +282,7 @@ export const ExportForm: React.FC<ExportFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="identity-form-submit"
+          id="submit"
           variant={ButtonVariant.primary}
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
         >
diff --git a/client/src/app/pages/migration-waves/components/manage-applications-form.tsx b/client/src/app/pages/migration-waves/components/manage-applications-form.tsx
index 9152601d20..1faaa633fd 100644
--- a/client/src/app/pages/migration-waves/components/manage-applications-form.tsx
+++ b/client/src/app/pages/migration-waves/components/manage-applications-form.tsx
@@ -293,7 +293,7 @@ export const ManageApplicationsForm: React.FC<ManageApplicationsFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="wave-form-submit"
+          id="submit"
           variant="primary"
           isDisabled={!isNewerSelection()}
         >
diff --git a/client/src/app/pages/migration-waves/components/migration-wave-form.tsx b/client/src/app/pages/migration-waves/components/migration-wave-form.tsx
index 3e23b49601..51aec5403a 100644
--- a/client/src/app/pages/migration-waves/components/migration-wave-form.tsx
+++ b/client/src/app/pages/migration-waves/components/migration-wave-form.tsx
@@ -13,13 +13,11 @@ import {
   DatePicker,
   Level,
   LevelItem,
-  Weekday,
 } from "@patternfly/react-core";
 
 import { useFetchStakeholders } from "@app/queries/stakeholders";
 import { useFetchStakeholderGroups } from "@app/queries/stakeholdergoups";
 import {
-  useFetchMigrationWaves,
   useCreateMigrationWaveMutation,
   useUpdateMigrationWaveMutation,
 } from "@app/queries/migration-waves";
@@ -155,7 +153,7 @@ export const WaveForm: React.FC<WaveFormProps> = ({
         "min-char-check",
         "Name is invalid. The name must be between 3 and 120 characters ",
         (value) => {
-          if (!!value) {
+          if (value) {
             const schema = yup
               .string()
               .min(3, t("validation.minLength", { length: 3 }))
@@ -428,7 +426,7 @@ export const WaveForm: React.FC<WaveFormProps> = ({
         <Button
           type="submit"
           aria-label="submit"
-          id="migration-wave-form-submit"
+          id="submit"
           variant="primary"
           isDisabled={!isValid || isSubmitting || isValidating || !isDirty}
         >
diff --git a/client/src/app/pages/proxies/proxy-form.tsx b/client/src/app/pages/proxies/proxy-form.tsx
index db3b089735..0ccb62b708 100644
--- a/client/src/app/pages/proxies/proxy-form.tsx
+++ b/client/src/app/pages/proxies/proxy-form.tsx
@@ -1,7 +1,6 @@
 import React, { useMemo } from "react";
 import {
   ActionGroup,
-  Alert,
   Button,
   ButtonVariant,
   Form,
@@ -388,7 +387,7 @@ export const ProxyForm: React.FC<ProxyFormProps> = ({
       <ActionGroup>
         <Button
           type="submit"
-          id="proxy-form-submit"
+          id="submit"
           aria-label="submit"
           variant={ButtonVariant.primary}
           isDisabled={