diff --git a/.nvmrc b/.nvmrc
deleted file mode 100644
index 62df50f1..00000000
--- a/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-14.17.0
diff --git a/components/admin/permit-holders/Header.tsx b/components/admin/permit-holders/Header.tsx
index 8553ec85..33b93ad3 100644
--- a/components/admin/permit-holders/Header.tsx
+++ b/components/admin/permit-holders/Header.tsx
@@ -1,4 +1,3 @@
-import { useRouter } from 'next/router';
 import {
   Alert,
   AlertIcon,
@@ -19,7 +18,6 @@ import { ChevronDownIcon, ChevronLeftIcon } from '@chakra-ui/icons'; // Chakra U
 import Link from 'next/link'; // Link
 import { ApplicantStatus } from '@lib/graphql/types';
 import PermitHolderStatusBadge from '@components/admin/PermitHolderStatusBadge';
-import ConfirmDeleteApplicantModal from '@components/admin/permit-holders/table/ConfirmDeleteApplicantModal';
 import SetPermitHolderToInactiveModal from '@components/admin/permit-holders/table/ConfirmSetInactiveModal';
 import SetPermitHolderToActiveModal from '@components/admin/permit-holders/table/ConfirmSetActiveModal';
 import AdditionalNotesModal from '@components/admin/permit-holders/additional-notes/Modal';
@@ -39,8 +37,6 @@ export default function PermitHolderHeader({
   applicant: { id, name, status, inactiveReason, notes },
   refetch,
 }: PermitHolderHeaderProps) {
-  const router = useRouter();
-
   // Set Permit Holder Inactive/Active modal state
   const {
     isOpen: isSetPermitHolderStatusModalOpen,
@@ -48,13 +44,6 @@ export default function PermitHolderHeader({
     onClose: onCloseSetPermitHolderStatusModal,
   } = useDisclosure();
 
-  // Delete applicant modal state
-  const {
-    isOpen: isDeleteApplicantModalOpen,
-    onOpen: onOpenDeleteApplicantModal,
-    onClose: onCloseDeleteApplicantModal,
-  } = useDisclosure();
-
   // Additional notes modal state
   const {
     isOpen: isNotesModalOpen,
@@ -108,13 +97,6 @@ export default function PermitHolderHeader({
                       >
                         {`Set as ${status === 'ACTIVE' ? 'Inactive' : 'Active'}`}
                       </MenuItem>
-                      <MenuItem
-                        color="text.critical"
-                        textStyle="button-regular"
-                        onClick={onOpenDeleteApplicantModal}
-                      >
-                        {'Delete Permit Holder'}
-                      </MenuItem>
                     </MenuList>
                   </Menu>
                 </Box>
@@ -161,17 +143,6 @@ export default function PermitHolderHeader({
           onClose={onCloseSetPermitHolderStatusModal}
         />
       )}
-      <ConfirmDeleteApplicantModal
-        isOpen={isDeleteApplicantModalOpen}
-        applicantId={id}
-        refetch={() => {
-          /* Do not refetch, redirect to permit holders page */
-        }}
-        onClose={() => {
-          onCloseDeleteApplicantModal();
-          router.push('/admin/permit-holders');
-        }}
-      />
 
       {/* Additional notes modal */}
       <AdditionalNotesModal
diff --git a/components/admin/permit-holders/permit-holder-information/Card.tsx b/components/admin/permit-holders/permit-holder-information/Card.tsx
index de20fdc1..d16fbedf 100644
--- a/components/admin/permit-holders/permit-holder-information/Card.tsx
+++ b/components/admin/permit-holders/permit-holder-information/Card.tsx
@@ -139,7 +139,7 @@ export default function PermitHolderInformationCard(props: PersonalInformationPr
             Date of Birth: {formatDateYYYYMMDD(new Date(dateOfBirth))}
           </Text>
           <Text as="p" textStyle="body-regular">
-            Gender: {gender === 'OTHER' && otherGender ? otherGender : titlecase(gender)}
+            Gender: {gender === 'OTHER' ? otherGender : titlecase(gender)}
           </Text>
         </VStack>
 
diff --git a/components/admin/permit-holders/permit-holder-information/EditModal.tsx b/components/admin/permit-holders/permit-holder-information/EditModal.tsx
index ba6c1734..b6af3fd7 100644
--- a/components/admin/permit-holders/permit-holder-information/EditModal.tsx
+++ b/components/admin/permit-holders/permit-holder-information/EditModal.tsx
@@ -76,7 +76,6 @@ export default function EditUserInformationModal({
           }}
           validationSchema={permitHolderInformationSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form noValidate>
diff --git a/components/admin/permit-holders/table/ConfirmDeleteApplicantModal.tsx b/components/admin/permit-holders/table/ConfirmDeleteApplicantModal.tsx
deleted file mode 100644
index db86f3f8..00000000
--- a/components/admin/permit-holders/table/ConfirmDeleteApplicantModal.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { SyntheticEvent } from 'react';
-import {
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalFooter,
-  ModalBody,
-  Button,
-  Text,
-  useToast,
-} from '@chakra-ui/react';
-import { useMutation } from '@tools/hooks/graphql';
-import {
-  DeleteApplicantRequest,
-  DeleteApplicantResponse,
-  DELETE_APPLICANT,
-} from '@tools/admin/permit-holders/permit-holders-table';
-
-type ConfirmDeleteApplicantModalProps = {
-  readonly isOpen: boolean;
-  readonly applicantId: number;
-  readonly refetch: () => void;
-  readonly onClose: () => void;
-};
-
-/**
- * Delete applicant confirmation modal
- */
-export default function ConfirmDeleteApplicantModal({
-  isOpen,
-  applicantId,
-  refetch,
-  onClose,
-}: ConfirmDeleteApplicantModalProps) {
-  const toast = useToast();
-
-  // API call to deleteApplicant
-  const [deleteApplicant] = useMutation<DeleteApplicantResponse, DeleteApplicantRequest>(
-    DELETE_APPLICANT,
-    {
-      onCompleted: data => {
-        if (data.deleteApplicant.ok) {
-          toast({
-            status: 'success',
-            description: `Permit holder successfully deleted.`,
-          });
-        } else {
-          toast({
-            status: 'error',
-            description: `Failed to delete permit holder.`,
-          });
-        }
-      },
-    }
-  );
-
-  // Close modal handler
-  const handleClose = () => {
-    onClose();
-  };
-
-  // Sets permit holder status to inactive and closes modal
-  const handleSubmit = async (event: SyntheticEvent) => {
-    event.preventDefault();
-    await deleteApplicant({
-      variables: { input: { id: applicantId } },
-    });
-    refetch();
-    onClose();
-  };
-
-  return (
-    <Modal isCentered={true} isOpen={isOpen} onClose={handleClose} size="3xl">
-      <ModalOverlay />
-      <form onSubmit={handleSubmit}>
-        <ModalContent paddingX="20px">
-          <ModalHeader paddingTop="20px" paddingBottom="12px" paddingX="4px">
-            <Text as="h2" textStyle="display-medium-bold">
-              {`Delete Permit Holder`}
-            </Text>
-          </ModalHeader>
-          <ModalBody paddingBottom="0px" paddingX="4px">
-            <Text as="p" textStyle="body-regular" marginBottom="20px">
-              Are you sure you want to delete this permit holder? This action is irreversible.
-            </Text>
-            <Text as="p" textStyle="body-regular" marginBottom="20px">
-              <b>
-                All of this user&apos;s data, including associated applications and permits will be
-                permanently deleted.
-              </b>
-            </Text>
-            <Text as="p" textStyle="body-regular" marginBottom="20px">
-              If you would like to retain this data, please cancel and mark this user as inactive
-              instead.
-            </Text>
-          </ModalBody>
-          <ModalFooter paddingY="16px">
-            <Button onClick={onClose} colorScheme="gray" variant="solid">
-              {'Cancel'}
-            </Button>
-            <Button
-              bg="secondary.critical"
-              _hover={{ bg: 'secondary.criticalHover' }}
-              type="submit"
-              ml={'12px'}
-            >
-              {'Delete Permit Holder'}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </form>
-    </Modal>
-  );
-}
diff --git a/components/admin/requests/Header.tsx b/components/admin/requests/Header.tsx
index 878aedb8..e823f8ba 100644
--- a/components/admin/requests/Header.tsx
+++ b/components/admin/requests/Header.tsx
@@ -1,33 +1,15 @@
-import { useRouter } from 'next/router';
-import {
-  Alert,
-  AlertIcon,
-  Box,
-  Button,
-  Flex,
-  HStack,
-  Link,
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuList,
-  Text,
-  useDisclosure,
-  VStack,
-} from '@chakra-ui/react'; // Chakra UI
-import { ChevronDownIcon, ChevronLeftIcon } from '@chakra-ui/icons'; // Chakra UI icon
+import { Box, Flex, HStack, Text, Link, VStack, Alert, AlertIcon } from '@chakra-ui/react'; // Chakra UI
+import { ChevronLeftIcon } from '@chakra-ui/icons'; // Chakra UI icon
 import NextLink from 'next/link'; // Link
 import RequestStatusBadge from '@components/admin/RequestStatusBadge'; // Request status badge
 import ShopifyBadge from '@components/admin/ShopifyBadge';
 import PermitTypeBadge from '@components/admin/PermitTypeBadge';
-import ConfirmDeleteRequestModal from './delete/ConfirmDeleteRequestModal';
 import { ApplicationStatus, ApplicationType, PermitType } from '@lib/graphql/types';
 import { titlecase } from '@tools/string';
 import { formatDateYYYYMMDD, formatDateYYYYMMDDLocal } from '@lib/utils/date';
 import { getPermanentPermitExpiryDate } from '@lib/utils/permit-expiry';
 
 type RequestHeaderProps = {
-  readonly id: number;
   readonly applicationType: ApplicationType;
   readonly permitType: PermitType;
   readonly createdAt: Date;
@@ -42,7 +24,6 @@ type RequestHeaderProps = {
 
 /**
  * Header of View Request page
- * @param id Application id
  * @param applicationType Type of application
  * @param permitType Type of permit
  * @param createdAt Date permit was created at
@@ -55,7 +36,6 @@ type RequestHeaderProps = {
  * @param reasonForRejection Reason for rejecting application
  */
 export default function RequestHeader({
-  id,
   applicationType,
   permitType,
   createdAt,
@@ -75,8 +55,6 @@ export default function RequestHeader({
     expiryDateText = `Expiry date: ${formatDateYYYYMMDD(permitExpiry)}`;
   } else if (permitType === 'TEMPORARY' && !!temporaryPermitExpiry) {
     expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(temporaryPermitExpiry)}`;
-  } else if (applicationType === 'REPLACEMENT' && !!permitExpiry) {
-    expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(permitExpiry)}`;
   } else if (permitType === 'PERMANENT') {
     expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(
       getPermanentPermitExpiryDate()
@@ -85,15 +63,6 @@ export default function RequestHeader({
     expiryDateText = null;
   }
 
-  const router = useRouter();
-
-  // Delete application modal state
-  const {
-    isOpen: isDeleteApplicationModalOpen,
-    onOpen: onOpenDeleteApplicationModal,
-    onClose: onCloseDeleteApplicationModal,
-  } = useDisclosure();
-
   return (
     <Box textAlign="left">
       <NextLink href="/admin" passHref>
@@ -119,27 +88,6 @@ export default function RequestHeader({
                 Received on {formatDateYYYYMMDDLocal(createdAt)} at{' '}
                 {createdAt.toLocaleTimeString('en-CA')}
               </Text>
-              <Menu>
-                <MenuButton
-                  as={Button}
-                  rightIcon={<ChevronDownIcon />}
-                  height="30px"
-                  bg="background.gray"
-                  _hover={{ bg: 'background.grayHover' }}
-                  color="black"
-                >
-                  <Text textStyle="caption">More Actions</Text>
-                </MenuButton>
-                <MenuList>
-                  <MenuItem
-                    color="text.critical"
-                    textStyle="button-regular"
-                    onClick={onOpenDeleteApplicationModal}
-                  >
-                    {'Delete Request'}
-                  </MenuItem>
-                </MenuList>
-              </Menu>
             </HStack>
             {displayShopifyUrl && (
               <Text textStyle="caption" as="p">
@@ -179,17 +127,6 @@ export default function RequestHeader({
             </Text>
           </Alert>
         )}
-        <ConfirmDeleteRequestModal
-          isOpen={isDeleteApplicationModalOpen}
-          applicationId={id}
-          refetch={() => {
-            /* Do not refetch, redirect to main page */
-          }}
-          onClose={() => {
-            onCloseDeleteApplicationModal();
-            router.push('/admin');
-          }}
-        />
       </VStack>
     </Box>
   );
diff --git a/components/admin/requests/additional-questions/EditModal.tsx b/components/admin/requests/additional-questions/EditModal.tsx
index b7af9dad..6c2b0181 100644
--- a/components/admin/requests/additional-questions/EditModal.tsx
+++ b/components/admin/requests/additional-questions/EditModal.tsx
@@ -61,7 +61,6 @@ export default function EditAdditionalInformationModal({
           initialValues={{ additionalInformation: additionalInformation }}
           validationSchema={editAdditionalQuestionsSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form style={{ width: '100%' }} noValidate>
diff --git a/components/admin/requests/delete/ConfirmDeleteRequestModal.tsx b/components/admin/requests/delete/ConfirmDeleteRequestModal.tsx
deleted file mode 100644
index dabba9e0..00000000
--- a/components/admin/requests/delete/ConfirmDeleteRequestModal.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { SyntheticEvent } from 'react';
-import {
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalFooter,
-  ModalBody,
-  Button,
-  Text,
-  useToast,
-} from '@chakra-ui/react';
-import { useMutation } from '@tools/hooks/graphql';
-import {
-  DeleteApplicationRequest,
-  DeleteApplicationResponse,
-  DELETE_APPLICATION_MUTATION,
-} from '@tools/admin/requests/delete-request-modal';
-
-type ConfirmDeleteRequestModalProps = {
-  readonly isOpen: boolean;
-  readonly applicationId: number;
-  readonly refetch: () => void;
-  readonly onClose: () => void;
-};
-
-/**
- * Delete request confirmation modal
- */
-export default function ConfirmDeleteRequestModal({
-  isOpen,
-  applicationId,
-  refetch,
-  onClose,
-}: ConfirmDeleteRequestModalProps) {
-  const toast = useToast();
-
-  // API call to deleteApplication
-  const [deleteApplication] = useMutation<DeleteApplicationResponse, DeleteApplicationRequest>(
-    DELETE_APPLICATION_MUTATION,
-    {
-      onCompleted: data => {
-        if (data.deleteApplication.ok) {
-          toast({
-            status: 'success',
-            description: `Request successfully deleted.`,
-          });
-        } else {
-          toast({
-            status: 'error',
-            description: `Failed to delete request.`,
-          });
-        }
-      },
-    }
-  );
-
-  // Close modal handler
-  const handleClose = () => {
-    onClose();
-  };
-
-  // Sets permit holder status to inactive and closes modal
-  const handleSubmit = async (event: SyntheticEvent) => {
-    event.preventDefault();
-    await deleteApplication({
-      variables: { input: { id: applicationId } },
-    });
-    refetch();
-    onClose();
-  };
-
-  return (
-    <Modal isCentered={true} isOpen={isOpen} onClose={handleClose} size="3xl">
-      <ModalOverlay />
-      <form onSubmit={handleSubmit}>
-        <ModalContent paddingX="20px">
-          <ModalHeader paddingTop="20px" paddingBottom="12px" paddingX="4px">
-            <Text as="h2" textStyle="display-medium-bold">
-              {`Delete Request`}
-            </Text>
-          </ModalHeader>
-          <ModalBody paddingBottom="0px" paddingX="4px">
-            <Text as="p" textStyle="body-regular" marginBottom="20px">
-              Are you sure you want to delete this request? This action is irreversible.
-            </Text>
-            <Text as="p" textStyle="body-regular" marginBottom="20px">
-              <b>
-                All data associated with this request will be permanently deleted and will no longer
-                show under the permit holder&apos;s recent apps.
-              </b>
-            </Text>
-          </ModalBody>
-          <ModalFooter paddingY="16px">
-            <Button onClick={onClose} colorScheme="gray" variant="solid">
-              {'Cancel'}
-            </Button>
-            <Button
-              bg="secondary.critical"
-              _hover={{ bg: 'secondary.criticalHover' }}
-              type="submit"
-              ml={'12px'}
-            >
-              {'Delete Request'}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </form>
-    </Modal>
-  );
-}
diff --git a/components/admin/requests/doctor-information/EditModal.tsx b/components/admin/requests/doctor-information/EditModal.tsx
index 1235fbd5..d41568f9 100644
--- a/components/admin/requests/doctor-information/EditModal.tsx
+++ b/components/admin/requests/doctor-information/EditModal.tsx
@@ -80,7 +80,6 @@ export default function EditDoctorInformationModal({
           initialValues={{ doctorInformation }}
           validationSchema={editPhysicianInformationSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ isValid }) => (
             <Form style={{ width: '100%' }} noValidate>
diff --git a/components/admin/requests/guardian-information/EditModal.tsx b/components/admin/requests/guardian-information/EditModal.tsx
index 4e50a7ae..c66c2984 100644
--- a/components/admin/requests/guardian-information/EditModal.tsx
+++ b/components/admin/requests/guardian-information/EditModal.tsx
@@ -136,7 +136,6 @@ const EditGuardianInformationModal: FC<Props> = ({ children, guardianInformation
           }}
           validationSchema={editGuardianInformationSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form style={{ width: '100%' }} noValidate>
diff --git a/components/admin/requests/payment-information/EditModal.tsx b/components/admin/requests/payment-information/EditModal.tsx
index f79db65f..65827b15 100644
--- a/components/admin/requests/payment-information/EditModal.tsx
+++ b/components/admin/requests/payment-information/EditModal.tsx
@@ -66,7 +66,6 @@ export default function EditPaymentDetailsModal({
           initialValues={{ paymentInformation }}
           validationSchema={editPaymentInformationSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form style={{ width: '100%' }} noValidate>
diff --git a/components/admin/requests/permit-holder-information/Card.tsx b/components/admin/requests/permit-holder-information/Card.tsx
index a64b95c5..2f0aee3a 100644
--- a/components/admin/requests/permit-holder-information/Card.tsx
+++ b/components/admin/requests/permit-holder-information/Card.tsx
@@ -94,8 +94,6 @@ const Card: FC<Props> = props => {
       | null;
     if (type === 'NEW') {
       const validatedData = await permitHolderInformationSchema.validate(permitHolderData);
-      // TODO: Remove this once schema is updated
-      validatedData.otherGender = '';
 
       ({ data } = await updateNewPermitHolderInformation({
         variables: { input: { id: applicationId, ...validatedData } },
diff --git a/components/admin/requests/permit-holder-information/EditModal.tsx b/components/admin/requests/permit-holder-information/EditModal.tsx
index 2c890145..31a010ab 100644
--- a/components/admin/requests/permit-holder-information/EditModal.tsx
+++ b/components/admin/requests/permit-holder-information/EditModal.tsx
@@ -79,7 +79,6 @@ export default function EditPermitHolderInformationModal({
           initialValues={{ permitHolder: { ...permitHolderInformation } }}
           validationSchema={editRequestPermitHolderInformationSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form style={{ width: '100%' }} noValidate>
diff --git a/components/admin/requests/physician-assessment/EditModal.tsx b/components/admin/requests/physician-assessment/EditModal.tsx
index d2a317e9..869cf1b0 100644
--- a/components/admin/requests/physician-assessment/EditModal.tsx
+++ b/components/admin/requests/physician-assessment/EditModal.tsx
@@ -63,7 +63,6 @@ export default function EditPhysicianAssessmentModal({
           }}
           validationSchema={editPhysicianAssessmentSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form noValidate>
diff --git a/components/admin/requests/processing/TasksCard.tsx b/components/admin/requests/processing/TasksCard.tsx
index 6d3d482f..b9048833 100644
--- a/components/admin/requests/processing/TasksCard.tsx
+++ b/components/admin/requests/processing/TasksCard.tsx
@@ -106,8 +106,8 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
 
   const [generateInvoice, { loading: generateInvoiceLoading }] =
     useMutation<GenerateInvoiceResponse, GenerateInvoiceRequest>(GENERATE_INVOICE_MUTATION);
-  const handleGenerateInvoice = async (isDonation: boolean) => {
-    await generateInvoice({ variables: { input: { applicationId, isDonation } } });
+  const handleGenerateInvoice = async () => {
+    await generateInvoice({ variables: { input: { applicationId } } });
     refetch();
   };
 
@@ -184,7 +184,6 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
       paidThroughShopify,
       shopifyConfirmationNumber,
       shopifyOrderNumber,
-      donationAmount,
       processing: {
         status,
         appNumber,
@@ -328,6 +327,7 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                 </Button>
               ) : null}
             </ProcessingTaskStep>
+
             {/* Task 2: Hole punch parking permit: Mark as complete (CHECK) */}
             <ProcessingTaskStep
               id={2}
@@ -380,9 +380,63 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                 </Button>
               ) : null}
             </ProcessingTaskStep>
-            {/* Task 3: Review Information: Review Information (MODAL) */}
+
+            {/* Task 3: Create a new wallet card: Mark as complete (CHECK) */}
             <ProcessingTaskStep
               id={3}
+              label="Create a new wallet card"
+              description="Include permit number, expiry date, full name and birth month"
+              isCompleted={walletCardCreated}
+              showLog={showTaskLog}
+              log={
+                showTaskLog && walletCardCreatedEmployee
+                  ? {
+                      name: formatFullName(
+                        walletCardCreatedEmployee.firstName,
+                        walletCardCreatedEmployee.lastName
+                      ),
+                      date: walletCardCreatedUpdatedAt,
+                    }
+                  : null
+              }
+            >
+              {walletCardCreated && !reviewRequestCompleted ? (
+                <Button
+                  variant="ghost"
+                  textDecoration="underline black"
+                  onClick={() => handleCreateWalletCard(false)}
+                  isDisabled={createWalletCardLoading}
+                  isLoading={createWalletCardLoading}
+                  loadingText="Undo"
+                  fontWeight="normal"
+                  fontSize="14px"
+                >
+                  <Text textStyle="caption" color="black">
+                    Undo
+                  </Text>
+                </Button>
+              ) : !walletCardCreated && !reviewRequestCompleted ? (
+                <Button
+                  marginLeft="auto"
+                  height="35px"
+                  bg="background.gray"
+                  _hover={{ bg: 'background.grayHover' }}
+                  color="black"
+                  onClick={() => handleCreateWalletCard(true)}
+                  isDisabled={createWalletCardLoading}
+                  isLoading={createWalletCardLoading}
+                  loadingText="Mark as complete"
+                  fontWeight="normal"
+                  fontSize="14px"
+                >
+                  <Text textStyle="xsmall-medium">Mark as complete</Text>
+                </Button>
+              ) : null}
+            </ProcessingTaskStep>
+
+            {/* Task 4: Review Information: Review Information (MODAL) */}
+            <ProcessingTaskStep
+              id={4}
               label={'Review request information'}
               description="Editing will be disabled upon completion of this step"
               isCompleted={reviewRequestCompleted}
@@ -401,7 +455,7 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
             >
               <ReviewInformationStep
                 isCompleted={reviewRequestCompleted}
-                isDisabled={!appNumber || !appHolepunched}
+                isDisabled={!appNumber || !appHolepunched || !walletCardCreated}
                 applicationId={applicationId}
                 onConfirmed={() => handleReviewRequestInformation(true)}
                 onUndo={() => {
@@ -410,14 +464,11 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                 loading={reviewRequestInformationLoading}
               />
             </ProcessingTaskStep>
-            {/* Task 4: Generate Invoice */}
+
+            {/* Task 5: Generate Invoice */}
             <ProcessingTaskStep
-              id={4}
-              label={
-                Number(donationAmount) >= 20
-                  ? 'Generate invoice and donation receipt'
-                  : 'Generate invoice'
-              }
+              id={5}
+              label="Generate invoice"
               description="Invoice number will be automatically assigned"
               isCompleted={invoice !== null}
               showLog={showTaskLog}
@@ -436,13 +487,9 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                   height="35px"
                   bg="background.gray"
                   _hover={!reviewRequestCompleted ? undefined : { bg: 'background.grayHover' }}
+                  disabled={!reviewRequestCompleted || generateInvoiceLoading}
                   color="black"
-                  onClick={() => {
-                    Number(donationAmount) >= 20
-                      ? handleGenerateInvoice(true)
-                      : handleGenerateInvoice(false);
-                  }}
-                  isDisabled={!reviewRequestCompleted || generateInvoiceLoading}
+                  onClick={handleGenerateInvoice}
                   isLoading={generateInvoiceLoading}
                   loadingText="Generate document"
                   fontWeight="normal"
@@ -473,9 +520,10 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                 </Tooltip>
               )}
             </ProcessingTaskStep>
-            {/* Task 5: Upload document: Choose document (UPLOAD FILE) */}
+
+            {/* Task 6: Upload document: Choose document (UPLOAD FILE) */}
             <ProcessingTaskStep
-              id={5}
+              id={6}
               label="Upload documents"
               description="Scan all documents and upload as one PDF"
               isCompleted={documentsUrl !== null}
@@ -500,58 +548,7 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                 loading={uploadDocumentsLoading}
               />
             </ProcessingTaskStep>
-            {/* Task 6: Create a new wallet card: Mark as complete (CHECK) */}
-            <ProcessingTaskStep
-              id={6}
-              label="Create a new wallet card"
-              description="Include permit number, expiry date, full name and birth month"
-              isCompleted={walletCardCreated}
-              showLog={showTaskLog}
-              log={
-                showTaskLog && walletCardCreatedEmployee
-                  ? {
-                      name: formatFullName(
-                        walletCardCreatedEmployee.firstName,
-                        walletCardCreatedEmployee.lastName
-                      ),
-                      date: walletCardCreatedUpdatedAt,
-                    }
-                  : null
-              }
-            >
-              {walletCardCreated ? (
-                <Button
-                  variant="ghost"
-                  textDecoration="underline black"
-                  onClick={() => handleCreateWalletCard(false)}
-                  isDisabled={createWalletCardLoading}
-                  isLoading={createWalletCardLoading}
-                  loadingText="Undo"
-                  fontWeight="normal"
-                  fontSize="14px"
-                >
-                  <Text textStyle="caption" color="black">
-                    Undo
-                  </Text>
-                </Button>
-              ) : (
-                <Button
-                  marginLeft="auto"
-                  height="35px"
-                  bg="background.gray"
-                  _hover={documentsUrl === null ? undefined : { bg: 'background.grayHover' }}
-                  color="black"
-                  onClick={() => handleCreateWalletCard(true)}
-                  isDisabled={documentsUrl === null || createWalletCardLoading}
-                  isLoading={createWalletCardLoading}
-                  loadingText="Mark as complete"
-                  fontWeight="normal"
-                  fontSize="14px"
-                >
-                  <Text textStyle="xsmall-medium">Mark as complete</Text>
-                </Button>
-              )}
-            </ProcessingTaskStep>
+
             {/* Task 7: Mail out: Mark as complete (CHECK) */}
             <ProcessingTaskStep
               id={7}
@@ -573,7 +570,7 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                   variant="ghost"
                   textDecoration="underline black"
                   onClick={() => handleMailOut(false)}
-                  isDisabled={mailOutLoading}
+                  disabled={mailOutLoading}
                   isLoading={mailOutLoading}
                   loadingText="Undo"
                   fontWeight="normal"
@@ -588,10 +585,10 @@ export default function ProcessingTasksCard({ applicationId }: ProcessingTasksCa
                   marginLeft="auto"
                   height="35px"
                   bg="background.gray"
-                  _hover={!walletCardCreated ? undefined : { bg: 'background.grayHover' }}
+                  _hover={documentsUrl === null ? undefined : { bg: 'background.grayHover' }}
                   color="black"
+                  disabled={documentsUrl === null || mailOutLoading}
                   onClick={() => handleMailOut(true)}
-                  isDisabled={!walletCardCreated || mailOutLoading}
                   isLoading={mailOutLoading}
                   loadingText="Mark as complete"
                   fontWeight="normal"
diff --git a/components/admin/requests/reason-for-replacement/EditModal.tsx b/components/admin/requests/reason-for-replacement/EditModal.tsx
index 01fc674b..49031c72 100644
--- a/components/admin/requests/reason-for-replacement/EditModal.tsx
+++ b/components/admin/requests/reason-for-replacement/EditModal.tsx
@@ -64,7 +64,6 @@ export default function EditReasonForReplacementModal({
           }}
           validationSchema={editReasonForReplacementFormSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form noValidate>
diff --git a/components/applicant/renewals/IdentityVerification.tsx b/components/applicant/renewals/IdentityVerification.tsx
index 2b512c69..bc3202c2 100644
--- a/components/applicant/renewals/IdentityVerification.tsx
+++ b/components/applicant/renewals/IdentityVerification.tsx
@@ -124,7 +124,6 @@ const IdentityVerification: FC = () => {
             }}
             validationSchema={verifyIdentitySchema}
             onSubmit={handleSubmit}
-            validateOnMount
           >
             {({ values, isValid }) => (
               <Form style={{ width: '100%' }} noValidate>
diff --git a/components/applicant/renewals/RenewalForm/AdditionalInformationSection.tsx b/components/applicant/renewals/RenewalForm/AdditionalInformationSection.tsx
index 464ed427..1d5408c9 100644
--- a/components/applicant/renewals/RenewalForm/AdditionalInformationSection.tsx
+++ b/components/applicant/renewals/RenewalForm/AdditionalInformationSection.tsx
@@ -48,7 +48,6 @@ const AdditionalInformationSection: FC = () => {
       initialValues={{ ...additionalInformation }}
       validationSchema={additionalQuestionsSchema}
       onSubmit={handleSubmit}
-      validateOnMount
     >
       {({ values, isValid }) => (
         <Form noValidate>
diff --git a/components/applicant/renewals/RenewalForm/ContactInformationSection.tsx b/components/applicant/renewals/RenewalForm/ContactInformationSection.tsx
index 96fc785f..23e465be 100644
--- a/components/applicant/renewals/RenewalForm/ContactInformationSection.tsx
+++ b/components/applicant/renewals/RenewalForm/ContactInformationSection.tsx
@@ -59,7 +59,6 @@ const ContactInformationSection: FC = () => {
       }}
       validationSchema={applicantFacingRenewalContactSchema}
       onSubmit={handleSubmit}
-      validateOnMount
     >
       {({ values, isValid }) => (
         <Form noValidate>
diff --git a/components/applicant/renewals/RenewalForm/DoctorInformationSection.tsx b/components/applicant/renewals/RenewalForm/DoctorInformationSection.tsx
index ddafb165..37cbb4db 100644
--- a/components/applicant/renewals/RenewalForm/DoctorInformationSection.tsx
+++ b/components/applicant/renewals/RenewalForm/DoctorInformationSection.tsx
@@ -87,7 +87,6 @@ const DoctorInformationSection: FC = () => {
       }}
       validationSchema={applicantFacingRenewalDoctorSchema}
       onSubmit={handleSubmit}
-      validateOnMount
     >
       {({ values, isValid }) => (
         <Form noValidate>
diff --git a/components/applicant/renewals/RenewalForm/DonationSection.tsx b/components/applicant/renewals/RenewalForm/DonationSection.tsx
index aa5870cb..f72701ff 100644
--- a/components/applicant/renewals/RenewalForm/DonationSection.tsx
+++ b/components/applicant/renewals/RenewalForm/DonationSection.tsx
@@ -35,7 +35,6 @@ const DonationSection: FC = () => {
       }}
       validationSchema={applicantFacingRenewalDonationSchema}
       onSubmit={handleSubmit}
-      validateOnMount
     >
       {({ values, isValid }) => (
         <Form noValidate>
diff --git a/components/applicant/renewals/RenewalForm/PersonalAddressSection.tsx b/components/applicant/renewals/RenewalForm/PersonalAddressSection.tsx
index 2ed5c0eb..674f5147 100644
--- a/components/applicant/renewals/RenewalForm/PersonalAddressSection.tsx
+++ b/components/applicant/renewals/RenewalForm/PersonalAddressSection.tsx
@@ -64,7 +64,6 @@ const PersonalAddressSection: FC = () => {
       }}
       validationSchema={applicantFacingRenewalPersonalAddressSchema}
       onSubmit={handleSubmit}
-      validateOnMount
     >
       {({ values, isValid }) => (
         <Form noValidate>
diff --git a/components/form/CheckboxField.tsx b/components/form/CheckboxField.tsx
index f67eece3..478bbccf 100644
--- a/components/form/CheckboxField.tsx
+++ b/components/form/CheckboxField.tsx
@@ -13,13 +13,13 @@ const CheckboxField: FC<Props> = props => {
   const isChecked = field.value;
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       <Checkbox {...field} isChecked={isChecked} {...checkboxProps}>
         {children}
       </Checkbox>
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
     </FormControl>
diff --git a/components/form/CheckboxGroupField.tsx b/components/form/CheckboxGroupField.tsx
index e6ecfde2..0b961dcd 100644
--- a/components/form/CheckboxGroupField.tsx
+++ b/components/form/CheckboxGroupField.tsx
@@ -24,14 +24,14 @@ const CheckboxGroupField: FC<Props> = props => {
   };
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       <FormLabel htmlFor={name}>{label}</FormLabel>
       <CheckboxGroup {...field} onChange={handleChange} {...checkboxGroupProps}>
         {children}
       </CheckboxGroup>
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
     </FormControl>
diff --git a/components/form/DateField.tsx b/components/form/DateField.tsx
index 263f83c7..63145e10 100644
--- a/components/form/DateField.tsx
+++ b/components/form/DateField.tsx
@@ -29,12 +29,12 @@ const DateField: FC<Props> = props => {
   };
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       <FormLabel htmlFor={name}>{label}</FormLabel>
       <Input type="date" {...field} onChange={handleChange} {...inputProps} />
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
       {children}
diff --git a/components/form/NumberField.tsx b/components/form/NumberField.tsx
index d1cb4057..ca45745f 100644
--- a/components/form/NumberField.tsx
+++ b/components/form/NumberField.tsx
@@ -21,14 +21,14 @@ const NumberField: FC<Props> = props => {
   const [field, meta] = useField(name);
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       <FormLabel htmlFor={name}>{label}</FormLabel>
       <NumberInput {...numberInputProps}>
         <NumberInputField {...field} />
       </NumberInput>
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
       {children}
diff --git a/components/form/RadioGroupField.tsx b/components/form/RadioGroupField.tsx
index cfba0323..cd0971e9 100644
--- a/components/form/RadioGroupField.tsx
+++ b/components/form/RadioGroupField.tsx
@@ -24,14 +24,14 @@ const RadioGroupField: FC<Props> = props => {
   };
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       {label && <FormLabel htmlFor={name}>{label}</FormLabel>}
       <RadioGroup id={name} {...field} onChange={handleChange} {...radioGroupProps}>
         {children}
       </RadioGroup>
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
     </FormControl>
diff --git a/components/form/SelectField.tsx b/components/form/SelectField.tsx
index 2a373bfc..81f82ccf 100644
--- a/components/form/SelectField.tsx
+++ b/components/form/SelectField.tsx
@@ -20,12 +20,12 @@ const SelectField: FC<Props> = props => {
   const [field, meta] = useField(name);
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       <FormLabel htmlFor={name}>{label}</FormLabel>
       <Select {...field} {...selectProps} />
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
     </FormControl>
diff --git a/components/form/TextAreaField.tsx b/components/form/TextAreaField.tsx
index f69b8f2b..a4a6db1d 100644
--- a/components/form/TextAreaField.tsx
+++ b/components/form/TextAreaField.tsx
@@ -20,12 +20,12 @@ const TextArea: FC<Props> = props => {
   const [field, meta] = useField(name);
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       {label && <FormLabel htmlFor={name}>{label}</FormLabel>}
       <Textarea {...textAreaProps} {...field} />
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
     </FormControl>
diff --git a/components/form/TextField.tsx b/components/form/TextField.tsx
index 82351a4a..779f0010 100644
--- a/components/form/TextField.tsx
+++ b/components/form/TextField.tsx
@@ -23,7 +23,7 @@ const TextField: FC<Props> = props => {
   const [field, meta] = useField(name);
 
   return (
-    <FormControl isInvalid={!!meta.error} isRequired={required}>
+    <FormControl isInvalid={!!meta.error && meta.touched} isRequired={required}>
       <FormLabel htmlFor={name}>{label}</FormLabel>
       {monetaryInput ? (
         <InputGroup>
@@ -37,7 +37,7 @@ const TextField: FC<Props> = props => {
       )}
       <FormErrorMessage>
         <Text as="span" textStyle="body-regular">
-          {meta.error || null}
+          {meta.touched && meta.error ? meta.error : null}
         </Text>
       </FormErrorMessage>
       {children}
diff --git a/lib/applicants/resolvers.ts b/lib/applicants/resolvers.ts
index 1bf9dafa..e014c8a6 100644
--- a/lib/applicants/resolvers.ts
+++ b/lib/applicants/resolvers.ts
@@ -3,8 +3,6 @@ import { Resolver } from '@lib/graphql/resolvers'; // Resolver type
 import { getMostRecentPermit } from '@lib/applicants/utils'; // Applicant utils
 import {
   Applicant,
-  DeleteApplicantResult,
-  MutationDeleteApplicantArgs,
   MutationSetApplicantAsActiveArgs,
   MutationSetApplicantAsInactiveArgs,
   MutationUpdateApplicantDoctorInformationArgs,
@@ -314,8 +312,8 @@ export const updateApplicantDoctorInformation: Resolver<
   const { id, mspNumber, ...data } = input;
   const { firstName, lastName, addressLine1, addressLine2, city } = input;
 
-  const phone = data.phone ? stripPhoneNumber(data.phone) : null;
-  const postalCode = data.postalCode ? stripPostalCode(data.postalCode) : null;
+  const phone = stripPhoneNumber(data.phone);
+  const postalCode = stripPostalCode(data.postalCode);
 
   try {
     await requestPhysicianInformationSchema.validate({
@@ -345,19 +343,10 @@ export const updateApplicantDoctorInformation: Resolver<
   let updatedApplicant;
 
   try {
-    const upsertData = {
-      firstName: firstName as string,
-      lastName: lastName as string,
-      phone: phone as string,
-      addressLine1: addressLine1 as string,
-      addressLine2: addressLine2 as string | null,
-      city: city as string,
-      postalCode: postalCode as string,
-    };
     const upsertPhysician = prisma.physician.upsert({
       where: { mspNumber },
-      create: { mspNumber, ...upsertData },
-      update: upsertData,
+      create: { mspNumber, ...data },
+      update: data,
     });
     const updateApplicant = prisma.applicant.update({
       where: { id },
@@ -460,7 +449,6 @@ export const updateApplicantGuardianInformation: Resolver<
       addressLine2: addressLine2 as string | null,
       city: city as string,
       postalCode: postalCode as string,
-      poaFormS3ObjectKey: data.poaFormS3ObjectKey,
     };
 
     updatedApplicant = await prisma.applicant.update({
@@ -722,81 +710,3 @@ export const updateApplicantNotes: Resolver<
 
   return { ok: true, error: null };
 };
-
-/**
- * Deletes the applicant with the provided ID, also deletes all associated
- * data (permits, medical information, applications, and guardian).
- * @returns Status of the operation (ok)
- */
-export const deleteApplicant: Resolver<MutationDeleteApplicantArgs, DeleteApplicantResult> = async (
-  _parent,
-  args,
-  { prisma, logger }
-) => {
-  const id = args.input.id;
-
-  try {
-    const applicant = await prisma.applicant.findUnique({
-      where: {
-        id,
-      },
-      rejectOnNotFound: true,
-    });
-
-    const applications = await prisma.application.findMany({
-      where: {
-        applicantId: applicant.id,
-      },
-    });
-    const applicationIds = applications.map(application => application.id);
-    const applicationProcessingIds = applications.map(
-      application => application.applicationProcessingId
-    );
-
-    // Ideally, we'd cascade the delete to relations with referential actions
-    // https://www.prisma.io/docs/concepts/components/prisma-schema/relations/referential-actions
-    // However, that would require making a schema change which is infeasible at this time
-    const cleanupOperations: any[] = [
-      prisma.permit.deleteMany({ where: { applicantId: applicant.id } }),
-      prisma.applicant.delete({ where: { id } }),
-      prisma.medicalInformation.delete({ where: { id: applicant.medicalInformationId } }),
-    ];
-
-    if (applicant.guardianId !== null) {
-      cleanupOperations.push(prisma.guardian.delete({ where: { id: applicant.guardianId } }));
-    }
-
-    applicationIds.forEach(applicationId => {
-      cleanupOperations.push(prisma.newApplication.deleteMany({ where: { applicationId } }));
-      cleanupOperations.push(prisma.renewalApplication.deleteMany({ where: { applicationId } }));
-      cleanupOperations.push(
-        prisma.replacementApplication.deleteMany({ where: { applicationId } })
-      );
-      cleanupOperations.push(prisma.application.deleteMany({ where: { id: applicationId } }));
-    });
-
-    applicationProcessingIds.forEach(applicationProcessingId => {
-      cleanupOperations.push(
-        prisma.applicationProcessing.deleteMany({
-          where: {
-            id: applicationProcessingId,
-          },
-        })
-      );
-    });
-
-    await prisma.$transaction(cleanupOperations);
-  } catch (err) {
-    if (err instanceof Prisma.PrismaClientKnownRequestError) {
-      return {
-        ok: false,
-        error: err.message,
-      };
-    }
-
-    logger.error({ error: err }, 'Unknown error occurred when attempting to delete applicant');
-    throw new ApolloError('Unable to delete applicant after encountering unknown error');
-  }
-
-  return { ok: true, error: null };
-};
diff --git a/lib/applicants/schema.ts b/lib/applicants/schema.ts
index acb2f94c..585ff12d 100644
--- a/lib/applicants/schema.ts
+++ b/lib/applicants/schema.ts
@@ -209,15 +209,4 @@ export default gql`
     ok: Boolean!
     error: String
   }
-
-  # Delete applicant
-  input DeleteApplicantInput {
-    # Applicant ID
-    id: Int!
-  }
-
-  type DeleteApplicantResult {
-    ok: Boolean!
-    error: String
-  }
 `;
diff --git a/lib/application-processing/resolvers.ts b/lib/application-processing/resolvers.ts
index 6ada7593..18349582 100644
--- a/lib/application-processing/resolvers.ts
+++ b/lib/application-processing/resolvers.ts
@@ -25,7 +25,7 @@ import {
   UpdateApplicationProcessingRefundPaymentResult,
 } from '@lib/graphql/types';
 import { getPermanentPermitExpiryDate } from '@lib/utils/permit-expiry';
-import { generateApplicationInvoicePdf, generateDonationInvoicePdf } from '@lib/invoices/utils';
+import { generateApplicationInvoicePdf } from '@lib/invoices/utils';
 import { getSignedUrlForS3, serverUploadToS3 } from '@lib/utils/s3-utils';
 import { formatDateYYYYMMDD } from '@lib/utils/date';
 import { Prisma } from '@prisma/client';
@@ -817,6 +817,24 @@ export const updateApplicationProcessingCreateWalletCard: Resolver<
   }
   const { id: employeeId } = session;
 
+  // Prevent changing wallet card creation status if review is complete
+  const application = await prisma.application.findUnique({
+    where: { id: applicationId },
+    include: {
+      applicationProcessing: {
+        select: {
+          reviewRequestCompleted: true,
+        },
+      },
+    },
+  });
+  if (application?.applicationProcessing.reviewRequestCompleted) {
+    return {
+      ok: false,
+      error: 'Cannot update wallet card status of already-reviewed application',
+    };
+  }
+
   let updatedApplicationProcessing;
   try {
     updatedApplicationProcessing = await prisma.application.update({
@@ -875,6 +893,7 @@ export const updateApplicationProcessingReviewRequestInformation: Resolver<
         select: {
           appNumber: true,
           appHolepunched: true,
+          walletCardCreated: true,
         },
       },
     },
@@ -882,7 +901,8 @@ export const updateApplicationProcessingReviewRequestInformation: Resolver<
   if (
     reviewRequestCompleted &&
     (!application?.applicationProcessing.appNumber ||
-      !application?.applicationProcessing.appHolepunched)
+      !application?.applicationProcessing.appHolepunched ||
+      !application?.applicationProcessing.walletCardCreated)
   ) {
     return { ok: false, error: 'Prior steps incomplete' };
   }
@@ -908,7 +928,6 @@ export const updateApplicationProcessingReviewRequestInformation: Resolver<
               disconnect: true,
             },
             documentsUrlUpdatedAt: new Date(),
-            walletCardCreated: false,
             appMailed: false,
             appMailedEmployee: { disconnect: true },
             appMailedUpdatedAt: new Date(),
@@ -944,7 +963,7 @@ export const updateApplicationProcessingGenerateInvoice: Resolver<
 > = async (_parent, args, { prisma, session, logger }) => {
   // TODO: Validation
   const { input } = args;
-  const { applicationId, isDonation } = input;
+  const { applicationId } = input;
 
   if (!session) {
     return { ok: false, error: 'Not authenticated' };
@@ -992,21 +1011,13 @@ export const updateApplicationProcessingGenerateInvoice: Resolver<
   const s3InvoiceKey = `rcd/invoices/${fileName}`;
 
   // Generate application invoice
-  const pdfDoc = isDonation
-    ? generateDonationInvoicePdf(
-        application,
-        session,
-        // TODO: Remove typecast when backend guard is implemented
-        application.applicationProcessing.appNumber as number,
-        receiptNumber
-      )
-    : generateApplicationInvoicePdf(
-        application,
-        session,
-        // TODO: Remove typecast when backend guard is implemented
-        application.applicationProcessing.appNumber as number,
-        receiptNumber
-      );
+  const pdfDoc = generateApplicationInvoicePdf(
+    application,
+    session,
+    // TODO: Remove typecast when backend guard is implemented
+    application.applicationProcessing.appNumber as number,
+    receiptNumber
+  );
 
   // Upload pdf to s3
   let uploadedPdf;
diff --git a/lib/application-processing/schema.ts b/lib/application-processing/schema.ts
index 8a586767..33834836 100644
--- a/lib/application-processing/schema.ts
+++ b/lib/application-processing/schema.ts
@@ -121,7 +121,6 @@ export default gql`
   # Generate invoice PDF for application
   input UpdateApplicationProcessingGenerateInvoiceInput {
     applicationId: Int!
-    isDonation: Boolean!
   }
 
   type UpdateApplicationProcessingGenerateInvoiceResult {
diff --git a/lib/applications/resolvers.ts b/lib/applications/resolvers.ts
index 10d5e1c7..c132101e 100644
--- a/lib/applications/resolvers.ts
+++ b/lib/applications/resolvers.ts
@@ -10,12 +10,10 @@ import {
   CreateNewApplicationResult,
   CreateRenewalApplicationResult,
   CreateReplacementApplicationResult,
-  DeleteApplicationResult,
   MutationCreateExternalRenewalApplicationArgs,
   MutationCreateNewApplicationArgs,
   MutationCreateRenewalApplicationArgs,
   MutationCreateReplacementApplicationArgs,
-  MutationDeleteApplicationArgs,
   MutationUpdateApplicationAdditionalInformationArgs,
   MutationUpdateApplicationDoctorInformationArgs,
   MutationUpdateApplicationGeneralInformationArgs,
@@ -1859,82 +1857,3 @@ export const updateApplicationPhysicianAssessment: Resolver<
 
   return { ok: true, error: null };
 };
-
-/**
- * Delete an application
- * @returns status of operation (ok)
- */
-export const deleteApplication: Resolver<MutationDeleteApplicationArgs, DeleteApplicationResult> =
-  async (_parent, args, { prisma, logger }) => {
-    const id = args.input.id;
-
-    const application = await prisma.application.findUnique({
-      where: {
-        id,
-      },
-    });
-
-    if (!application) {
-      return { ok: false, error: `Application with ID ${id} not found` };
-    }
-
-    try {
-      const deleteApplicationOperation = prisma.application.deleteMany({
-        where: {
-          id,
-        },
-      });
-
-      const deleteApplicationProcessingOperation = prisma.applicationProcessing.deleteMany({
-        where: {
-          id: application.applicationProcessingId,
-        },
-      });
-
-      const deleteNewApplicationOperation = prisma.newApplication.deleteMany({
-        where: {
-          applicationId: id,
-        },
-      });
-
-      const deletePermitOperation = prisma.permit.deleteMany({
-        where: {
-          applicationId: id,
-        },
-      });
-
-      const deleteRenewalApplicationOperation = prisma.renewalApplication.deleteMany({
-        where: {
-          applicationId: id,
-        },
-      });
-
-      const deleteReplacementApplicationOperation = prisma.replacementApplication.deleteMany({
-        where: {
-          applicationId: id,
-        },
-      });
-
-      await prisma.$transaction([
-        deleteNewApplicationOperation,
-        deleteRenewalApplicationOperation,
-        deleteReplacementApplicationOperation,
-        deletePermitOperation,
-        deleteApplicationOperation,
-        deleteApplicationProcessingOperation,
-      ]);
-    } catch (err) {
-      if (err instanceof Prisma.PrismaClientKnownRequestError) {
-        return {
-          ok: false,
-          error: err.message,
-        };
-      }
-
-      // Unknown error
-      logger.error({ error: err }, 'Unknown error occurred when attempting to delete application');
-      throw new ApolloError('Unable to delete application after encountering unknown error');
-    }
-
-    return { ok: true, error: null };
-  };
diff --git a/lib/applications/schema.ts b/lib/applications/schema.ts
index fdefb491..0f525bd6 100644
--- a/lib/applications/schema.ts
+++ b/lib/applications/schema.ts
@@ -794,15 +794,4 @@ export default gql`
     ok: Boolean!
     error: String
   }
-
-  # Delete application
-  input DeleteApplicationInput {
-    # Application ID
-    id: Int!
-  }
-
-  type DeleteApplicationResult {
-    ok: Boolean!
-    error: String
-  }
 `;
diff --git a/lib/graphql/resolvers.ts b/lib/graphql/resolvers.ts
index 2b706127..9fe61ce2 100644
--- a/lib/graphql/resolvers.ts
+++ b/lib/graphql/resolvers.ts
@@ -10,7 +10,6 @@ import {
 import {
   applicant,
   applicants,
-  deleteApplicant,
   updateApplicantGeneralInformation,
   updateApplicantDoctorInformation,
   updateApplicantGuardianInformation,
@@ -34,7 +33,6 @@ import {
   updateApplicationPhysicianAssessment,
   updateNewApplicationGeneralInformation,
   updateApplicationGuardianInformation,
-  deleteApplication,
 } from '@lib/applications/resolvers'; // Application resolvers
 import {
   approveApplication,
@@ -161,7 +159,6 @@ const resolvers = {
     setApplicantAsActive: authorize(setApplicantAsActive, ['SECRETARY']),
     setApplicantAsInactive: authorize(setApplicantAsInactive, ['SECRETARY']),
     verifyIdentity,
-    deleteApplicant: authorize(deleteApplicant, ['SECRETARY']),
 
     // Applications
     createNewApplication: authorize(createNewApplication, ['SECRETARY']),
@@ -192,7 +189,6 @@ const resolvers = {
     updateApplicationPhysicianAssessment: authorize(updateApplicationPhysicianAssessment, [
       'SECRETARY',
     ]),
-    deleteApplication: authorize(deleteApplication, ['SECRETARY']),
 
     // Application processing
     approveApplication: authorize(approveApplication, ['SECRETARY']),
diff --git a/lib/graphql/schema.ts b/lib/graphql/schema.ts
index e6850328..f3e3de95 100644
--- a/lib/graphql/schema.ts
+++ b/lib/graphql/schema.ts
@@ -46,7 +46,6 @@ export default gql`
     setApplicantAsInactive(input: SetApplicantAsInactiveInput!): SetApplicantAsInactiveResult
     verifyIdentity(input: VerifyIdentityInput!): VerifyIdentityResult!
     updateApplicantNotes(input: UpdateApplicantNotesInput!): UpdateApplicantNotesResult!
-    deleteApplicant(input: DeleteApplicantInput!): DeleteApplicantResult!
 
     # Applications
     createNewApplication(input: CreateNewApplicationInput!): CreateNewApplicationResult
@@ -81,7 +80,6 @@ export default gql`
     updateApplicationPhysicianAssessment(
       input: UpdateApplicationPhysicianAssessmentInput!
     ): UpdateApplicationPhysicianAssessmentResult
-    deleteApplication(input: DeleteApplicationInput!): DeleteApplicationResult!
 
     # Application processing
     approveApplication(input: ApproveApplicationInput!): ApproveApplicationResult
diff --git a/lib/graphql/types.ts b/lib/graphql/types.ts
index cde0f7d6..2f189962 100644
--- a/lib/graphql/types.ts
+++ b/lib/graphql/types.ts
@@ -74,16 +74,6 @@ export type ApplicantsResult = {
   totalCount: Scalars['Int'];
 };
 
-export type DeleteApplicationInput = {
-  id: Scalars['Int'];
-};
-
-export type DeleteApplicationResult = {
-  __typename?: 'DeleteApplicationResult';
-  ok: Scalars['Boolean'];
-  error: Maybe<Scalars['String']>;
-};
-
 export type Application = {
   id: Scalars['Int'];
   firstName: Scalars['String'];
@@ -460,16 +450,6 @@ export type CreateReplacementApplicationResult = {
 };
 
 
-export type DeleteApplicantInput = {
-  id: Scalars['Int'];
-};
-
-export type DeleteApplicantResult = {
-  __typename?: 'DeleteApplicantResult';
-  ok: Scalars['Boolean'];
-  error: Maybe<Scalars['String']>;
-};
-
 export type DeleteEmployeeInput = {
   id: Scalars['Int'];
 };
@@ -600,7 +580,6 @@ export type Mutation = {
   setApplicantAsInactive: Maybe<SetApplicantAsInactiveResult>;
   verifyIdentity: VerifyIdentityResult;
   updateApplicantNotes: UpdateApplicantNotesResult;
-  deleteApplicant: DeleteApplicantResult;
   createNewApplication: Maybe<CreateNewApplicationResult>;
   createRenewalApplication: Maybe<CreateRenewalApplicationResult>;
   createExternalRenewalApplication: CreateExternalRenewalApplicationResult;
@@ -613,7 +592,6 @@ export type Mutation = {
   updateApplicationPaymentInformation: Maybe<UpdateApplicationPaymentInformationResult>;
   updateApplicationReasonForReplacement: Maybe<UpdateApplicationReasonForReplacementResult>;
   updateApplicationPhysicianAssessment: Maybe<UpdateApplicationPhysicianAssessmentResult>;
-  deleteApplication: DeleteApplicationResult;
   approveApplication: Maybe<ApproveApplicationResult>;
   rejectApplication: Maybe<RejectApplicationResult>;
   completeApplication: Maybe<CompleteApplicationResult>;
@@ -666,11 +644,6 @@ export type MutationUpdateApplicantNotesArgs = {
 };
 
 
-export type MutationDeleteApplicantArgs = {
-  input: DeleteApplicantInput;
-};
-
-
 export type MutationCreateNewApplicationArgs = {
   input: CreateNewApplicationInput;
 };
@@ -800,10 +773,6 @@ export type MutationDeleteEmployeeArgs = {
   input: DeleteEmployeeInput;
 };
 
-export type MutationDeleteApplicationArgs = {
-  input: DeleteApplicationInput;
-};
-
 export type NewApplication = Application & {
   __typename?: 'NewApplication';
   id: Scalars['Int'];
@@ -1420,7 +1389,6 @@ export type UpdateApplicationProcessingCreateWalletCardResult = {
 
 export type UpdateApplicationProcessingGenerateInvoiceInput = {
   applicationId: Scalars['Int'];
-  isDonation: Scalars['Boolean'];
 };
 
 export type UpdateApplicationProcessingGenerateInvoiceResult = {
diff --git a/lib/invoices/utils.ts b/lib/invoices/utils.ts
index b803a424..bfad9bfb 100644
--- a/lib/invoices/utils.ts
+++ b/lib/invoices/utils.ts
@@ -66,7 +66,7 @@ export const generateApplicationInvoicePdf = (
         postalCode: application.shippingPostalCode as string,
       };
 
-  const definition = applicationPdfDefinition({
+  const definition = pdfDefinition({
     applicantName,
     userNumber: applicantId,
     permitType,
@@ -92,7 +92,7 @@ export const generateApplicationInvoicePdf = (
 };
 
 /** PDF generation schema */
-const applicationPdfDefinition = (input: {
+const pdfDefinition = (input: {
   applicantName: string;
   userNumber: number | null;
   permitType: string;
@@ -242,296 +242,3 @@ const applicationPdfDefinition = (input: {
     },
   };
 };
-
-/**
- * Generate donation receipt PDF
- * @param application application object
- * @param session session object containing employee information
- * @param appNumber APP (parking permit) number
- * @param receiptNumber receipt number
- */
-export const generateDonationInvoicePdf = (
-  application: Application,
-  session: Session,
-  appNumber: number,
-  receiptNumber: string
-): PDFKit.PDFDocument => {
-  const {
-    applicantId,
-    firstName,
-    middleName,
-    lastName,
-    permitType,
-    processingFee,
-    paymentMethod,
-    donationAmount,
-    email,
-    createdAt,
-  } = application;
-  const applicantName = formatFullName(firstName, middleName, lastName);
-  const employeeInitials = `${session.firstName[0].toUpperCase()}${session.lastName[0].toUpperCase()}`;
-  let totalAmount: Prisma.Decimal = processingFee;
-  const nonNullEmail = email ? email : '';
-  const paymentItems = [
-    {
-      item: `PP # ${appNumber}`,
-      amount: processingFee,
-      paidBy: paymentMethod,
-      subtotal: processingFee,
-    },
-  ];
-  if (!donationAmount.equals(0)) {
-    paymentItems.push({
-      item: 'Donation',
-      amount: donationAmount,
-      paidBy: paymentMethod,
-      subtotal: donationAmount,
-    });
-    totalAmount = totalAmount.plus(donationAmount);
-  }
-  const address = application.shippingAddressSameAsHomeAddress
-    ? {
-        addressLine1: application.addressLine1,
-        addressLine2: application.addressLine2,
-        city: application.city,
-        province: application.province,
-        country: application.country,
-        postalCode: application.postalCode,
-      }
-    : {
-        addressLine1: application.shippingAddressLine1 as string,
-        addressLine2: application.shippingAddressLine2,
-        city: application.shippingCity as string,
-        province: application.shippingProvince as string,
-        country: application.shippingCountry as string,
-        postalCode: application.shippingPostalCode as string,
-      };
-
-  const definition = donationPdfDefinition({
-    applicantName,
-    userNumber: applicantId,
-    appNumber: appNumber,
-    permitType,
-    receiptNumber,
-    dateIssued: new Date(),
-    dateDonationRecevied: createdAt,
-    issuedBy: employeeInitials,
-    donationAmount,
-    paymentItems,
-    totalAmount,
-    address,
-    nonNullEmail,
-  });
-  const printer = new pdfPrinter({
-    Helvetica: {
-      normal: 'Helvetica',
-      bold: 'Helvetica-Bold',
-      italics: 'Helvetica-Oblique',
-      bolditalics: 'Helvetica-BoldOblique',
-    },
-  });
-
-  const pdfDocument = printer.createPdfKitDocument(definition);
-  pdfDocument.end();
-  return pdfDocument;
-};
-
-/** PDF generation schema */
-const donationPdfDefinition = (input: {
-  applicantName: string;
-  userNumber: number | null;
-  appNumber: number | null;
-  permitType: string;
-  receiptNumber: string;
-  dateIssued: Date;
-  dateDonationRecevied: Date;
-  issuedBy: string;
-  paymentItems: Array<{
-    item: string;
-    amount: Prisma.Decimal;
-    paidBy: PaymentType;
-    subtotal: Prisma.Decimal;
-  }>;
-  totalAmount: Prisma.Decimal;
-  donationAmount: Prisma.Decimal;
-  address: {
-    addressLine1: string;
-    addressLine2: string | null;
-    city: string;
-    province: string;
-    country: string;
-    postalCode: string;
-  };
-  nonNullEmail: string;
-}): any => {
-  const {
-    applicantName,
-    userNumber,
-    appNumber,
-    permitType,
-    receiptNumber,
-    donationAmount,
-    totalAmount,
-    dateIssued,
-    issuedBy,
-    dateDonationRecevied,
-    paymentItems,
-    address,
-    nonNullEmail,
-  } = input;
-
-  return {
-    footer: function (currentPage: number, pageCount: number) {
-      return currentPage == pageCount
-        ? {
-            text: `For information on all registered charities in Canada under the Income Tax Act please contact: Canada Revenue Agency www.cra.gc.ca/charities-giving `,
-            style: 'footer',
-          }
-        : null;
-    },
-    content: applicationPdfDefinition({
-      applicantName,
-      userNumber,
-      permitType,
-      receiptNumber,
-      dateIssued,
-      issuedBy,
-      paymentItems,
-      totalAmount,
-      address,
-    }).content.concat([
-      {
-        pageBreak: 'before',
-        text: [
-          { text: 'RICHMOND CENTRE FOR DISABILITY', style: 'header' },
-          '\n\n',
-          {
-            text: `Official Donation Receipt for Income Tax Purposes - ${dateIssued.getFullYear()}`,
-            style: 'subheaderDonation',
-          },
-        ],
-      },
-      {
-        columns: [
-          {
-            table: {
-              heights: 20,
-              body: [
-                [
-                  { text: 'Tax Receipt #:' },
-                  `PPD_${dateIssued.getFullYear()}${dateIssued.getMonth()}${dateIssued.getDate()}_${appNumber}`,
-                ],
-                [
-                  { text: 'Donated by:' },
-                  {
-                    text: [
-                      `${applicantName}\n`,
-                      `${address.addressLine2 ? `${address.addressLine2} - ` : ''}${
-                        address.addressLine1
-                      }\n`,
-                      `${address.city} ${address.province} ${formatPostalCode(address.postalCode)}`,
-                    ],
-                    fontSize: 12,
-                    lineHeight: 1.5,
-                  },
-                ],
-                [{ text: '' }, ''],
-                [{ text: '' }, ''],
-                [{ text: '' }, ''],
-                [{ text: 'Email:' }, nonNullEmail],
-                [{ text: 'Date Receipt Issued:' }, formatDateYYYYMMDD(dateIssued)],
-                [{ text: 'Location Receipt Issued:' }, 'Richmond, BC'],
-                [{ text: 'Authorized Signature:' }, { image: 'signature', width: 150 }],
-              ],
-            },
-            layout: 'noBorders',
-            margin: [0, 0, 20, 0],
-          },
-          {
-            table: {
-              heights: 20,
-              body: [
-                [{ text: 'Date Donation Received:' }, formatDateYYYYMMDD(dateDonationRecevied)],
-                [{ text: 'Donor Number:' }, `P${appNumber}`],
-                [{ text: 'Total Amount:' }, `$${donationAmount.toString()}`],
-                [{ text: 'Value of Product / Services:' }, ''],
-                [
-                  { text: 'Eligible Amount of Donation for Tax Purposes:' },
-                  `$${donationAmount.toString()}`,
-                ],
-                [{ text: '' }, ''],
-                [{ text: 'Where Applicable', bold: true }, ''],
-                [
-                  {
-                    text: [
-                      'Description of Items Received:\n\n',
-                      'Apprasied By:\n\n',
-                      'Address of Appraiser:\n\n',
-                    ],
-                  },
-                  { image: 'stamp', width: 85 },
-                ],
-              ],
-            },
-            layout: 'noBorders',
-            margin: [20, 0, 0, 0],
-          },
-        ],
-        margin: [0, 35, 0, 25],
-      },
-      {
-        text: [
-          `Dear ${applicantName}\n\n`,
-          'On behalf of the Richmond Centre for Disability (RCD), we would like to extend our sincere and\n',
-          'heartfelt thanks and appreciation for your donation. Please find your official tax receipt enclosed.\n\n',
-          'Through RCD services and support, we have seen the lives of people with disabilities and their\n',
-          'families changed for the better. Your generosity does make a difference in the delivery of much\n',
-          'coveted services to people with disabilities. The work being undertaken through the RCD is only\n',
-          'possible because of caring people like you.\n\n',
-          'Thank you again for your valued support.\n\n',
-          'Sincerely,\n\n\n',
-          'RICHMOND CENTRE FOR DISABILITY\n',
-          '(Charity Number: 88832-8432-RR0001)\n',
-          '#842 - 5300 No. 3 Road\n',
-          'Richmond, BC V6x 2X9\n',
-          'Tel: 604-232-2404\n',
-          'Website:www.rcdrichmond.org\n',
-        ],
-        margin: [0, 15, 0, 0],
-        fontSize: 12,
-      },
-    ]),
-    styles: {
-      header: {
-        fontSize: 28,
-        bold: true,
-        alignment: 'center',
-      },
-      tableHeader: {
-        bold: true,
-        alignment: 'center',
-      },
-      subheader: {
-        fontSize: 20,
-        bold: false,
-        alignment: 'center',
-      },
-      subheaderDonation: {
-        fontSize: 19,
-        alignment: 'center',
-      },
-      footer: {
-        fontSize: 8,
-        alignment: 'center',
-      },
-    },
-    defaultStyle: {
-      font: 'Helvetica',
-    },
-    images: {
-      rcd: 'public/assets/logo.png',
-      signature: 'public/assets/signature.png',
-      stamp: 'public/assets/stamp.png',
-    },
-  };
-};
diff --git a/pages/admin/login.tsx b/pages/admin/login.tsx
index ff154059..bdc8e19d 100644
--- a/pages/admin/login.tsx
+++ b/pages/admin/login.tsx
@@ -83,7 +83,6 @@ export default function Login() {
                   initialValues={{ email: '' }}
                   validationSchema={loginSchema}
                   onSubmit={handleSubmit}
-                  validateOnMount
                 >
                   <Form style={{ width: '100%' }}>
                     <TextField name="email" label="Email" height="51px" />
diff --git a/pages/admin/permit-holders.tsx b/pages/admin/permit-holders.tsx
index 379fe800..bc4bda7c 100644
--- a/pages/admin/permit-holders.tsx
+++ b/pages/admin/permit-holders.tsx
@@ -47,7 +47,6 @@ import useDebounce from '@tools/hooks/useDebounce'; // Debouncer
 import { useEffect } from 'react'; // React
 import { formatFullName, formatPhoneNumber } from '@lib/utils/format'; // String formatter util
 import { formatDateYYYYMMDD } from '@lib/utils/date'; // Date formatter util
-import ConfirmDeleteApplicantModal from '@components/admin/permit-holders/table/ConfirmDeleteApplicantModal';
 import SetPermitHolderToInactiveModal from '@components/admin/permit-holders/table/ConfirmSetInactiveModal'; // Set Permit Holder To Inactive modal
 import SetPermitHolderToActiveModal from '@components/admin/permit-holders/table/ConfirmSetActiveModal'; // Set Permit Holder To Active modal
 import GenerateReportModal from '@components/admin/permit-holders/reports/GenerateModal'; // Generate report modal
@@ -158,20 +157,10 @@ const PermitHolders: NextPage = () => {
     onClose: onCloseGenerateReportModal,
   } = useDisclosure();
 
-  // Delete applicant modal state
-  const {
-    isOpen: isDeleteApplicantModalOpen,
-    onOpen: onOpenDeleteApplicantModal,
-    onClose: onCloseDeleteApplicantModal,
-  } = useDisclosure();
-
   // Sets the data required for the Set Permit Holder Inactive/Active modals
   const [permitHolderToUpdateStatus, setPermitHolderToUpdateStatus] =
     useState<PermitHolderToUpdateStatus>();
 
-  // Applicant ID of the permit holder to delete
-  const [permitHolderToDelete, setPermitHolderToDelete] = useState<number>();
-
   const COLUMNS = useMemo<Column<PermitHolderRow>[]>(
     () => [
       {
@@ -301,17 +290,6 @@ const PermitHolders: NextPage = () => {
                 >
                   {`Set as ${status === 'ACTIVE' ? 'Inactive' : 'Active'}`}
                 </MenuItem>
-                <MenuItem
-                  color="text.critical"
-                  textStyle="button-regular"
-                  onClick={event => {
-                    event.stopPropagation();
-                    setPermitHolderToDelete(id);
-                    onOpenDeleteApplicantModal();
-                  }}
-                >
-                  {'Delete Permit Holder'}
-                </MenuItem>
               </MenuList>
             </Menu>
           );
@@ -321,12 +299,7 @@ const PermitHolders: NextPage = () => {
         maxWidth: 120,
       },
     ],
-    [
-      setPermitHolderToUpdateStatus,
-      onOpenSetPermitHolderStatusModal,
-      setPermitHolderToDelete,
-      onOpenDeleteApplicantModal,
-    ]
+    [setPermitHolderToUpdateStatus, onOpenSetPermitHolderStatusModal]
   );
 
   return (
@@ -538,14 +511,6 @@ const PermitHolders: NextPage = () => {
           onClose={onCloseSetPermitHolderStatusModal}
         />
       )}
-      {permitHolderToDelete !== undefined && (
-        <ConfirmDeleteApplicantModal
-          isOpen={isDeleteApplicantModalOpen}
-          applicantId={permitHolderToDelete}
-          refetch={refetch}
-          onClose={onCloseDeleteApplicantModal}
-        />
-      )}
       <GenerateReportModal
         isOpen={isGenerateReportModalOpen}
         onClose={onCloseGenerateReportModal}
diff --git a/pages/admin/request/[id].tsx b/pages/admin/request/[id].tsx
index 108bc508..f7629fb6 100644
--- a/pages/admin/request/[id].tsx
+++ b/pages/admin/request/[id].tsx
@@ -63,11 +63,6 @@ const Request: NextPage<Props> = ({ id: idString }: Props) => {
     permit,
   } = data.application;
 
-  // Get expiry date to display
-  const mostRecentPermitExpiryDate = data.application.applicant?.mostRecentPermit?.expiryDate;
-  const permitExpiry =
-    type === 'REPLACEMENT' ? mostRecentPermitExpiryDate : permit ? permit.expiryDate : null;
-
   // Whether all application processing steps are completed
   const allStepsCompleted = !!(
     appNumber !== null &&
@@ -86,7 +81,6 @@ const Request: NextPage<Props> = ({ id: idString }: Props) => {
     <Layout>
       <GridItem rowSpan={1} colSpan={12} marginTop={3} marginBottom="12px">
         <RequestHeader
-          id={id}
           applicationStatus={status}
           applicationType={type}
           permitType={permitType}
@@ -94,7 +88,7 @@ const Request: NextPage<Props> = ({ id: idString }: Props) => {
           paidThroughShopify={paidThroughShopify}
           shopifyOrderID={shopifyConfirmationNumber || undefined}
           shopifyOrderNumber={shopifyOrderNumber || undefined}
-          permitExpiry={permitExpiry}
+          permitExpiry={permit && permit.expiryDate}
           temporaryPermitExpiry={temporaryPermitExpiry || null}
           reasonForRejection={rejectedReason || undefined}
         />
diff --git a/pages/admin/request/create-new.tsx b/pages/admin/request/create-new.tsx
index 58875b0e..dc3d722e 100644
--- a/pages/admin/request/create-new.tsx
+++ b/pages/admin/request/create-new.tsx
@@ -447,7 +447,6 @@ export default function CreateNew() {
             }}
             validationSchema={createNewRequestFormSchema}
             onSubmit={handleSubmit}
-            validateOnMount
           >
             {({ values, isValid }) => (
               <Form noValidate>
diff --git a/pages/admin/request/create-renewal.tsx b/pages/admin/request/create-renewal.tsx
index 88bac07b..a18ad146 100644
--- a/pages/admin/request/create-renewal.tsx
+++ b/pages/admin/request/create-renewal.tsx
@@ -283,7 +283,6 @@ export default function CreateRenewal() {
             }}
             validationSchema={renewalRequestFormSchema}
             onSubmit={handleSubmit}
-            validateOnMount
           >
             {({ values, isValid }) => (
               <Form noValidate>
diff --git a/pages/admin/request/create-replacement.tsx b/pages/admin/request/create-replacement.tsx
index 554a1e61..4ce1af6b 100644
--- a/pages/admin/request/create-replacement.tsx
+++ b/pages/admin/request/create-replacement.tsx
@@ -224,7 +224,6 @@ export default function CreateReplacement() {
             }}
             validationSchema={replacementRequestFormSchema}
             onSubmit={handleSubmit}
-            validateOnMount
           >
             {({ values, isValid }) => (
               <Form noValidate>
diff --git a/public/assets/signature.png b/public/assets/signature.png
deleted file mode 100644
index b62b0fe2..00000000
Binary files a/public/assets/signature.png and /dev/null differ
diff --git a/public/assets/stamp.png b/public/assets/stamp.png
deleted file mode 100644
index f75d46a3..00000000
Binary files a/public/assets/stamp.png and /dev/null differ
diff --git a/tools/admin/permit-holders/app-history.ts b/tools/admin/permit-holders/app-history.ts
index 431da266..a2ee9a31 100644
--- a/tools/admin/permit-holders/app-history.ts
+++ b/tools/admin/permit-holders/app-history.ts
@@ -1,19 +1,30 @@
-import { Application, ApplicationProcessing, Invoice, Permit } from '@lib/graphql/types';
+import {
+  Application,
+  ApplicationProcessing,
+  Invoice,
+  NewApplication,
+  Permit,
+  PermitType,
+} from '@lib/graphql/types';
 
 /** APP history entry record (API response) */
 export type AppHistoryRecord = Pick<Permit, 'rcdPermitId' | 'expiryDate'> & {
-  application: Pick<Application, 'id' | 'type' | 'permitType'> & {
+  application: Pick<Application, 'id'> & {
     processing: Pick<ApplicationProcessing, 'documentsUrl' | 'documentsS3ObjectKey'> & {
       invoice: Pick<Invoice, 's3ObjectUrl' | 's3ObjectKey'>;
     };
-  };
+  } & (
+      | ({ type: 'NEW' } & Pick<NewApplication, 'permitType'>)
+      | { type: 'RENEWAL' | 'REPLACEMENT'; permitType: undefined }
+    );
 };
 
 /** APP history entry row in APP history card (FE) */
 export type PermitRecord = Pick<Permit, 'rcdPermitId' | 'expiryDate'> & {
-  application: Pick<Application, 'id' | 'type' | 'permitType'> & {
+  application: Pick<Application, 'id' | 'type'> & {
     processing: Pick<ApplicationProcessing, 'documentsUrl' | 'documentsS3ObjectKey'> & {
       invoice: Pick<Invoice, 's3ObjectUrl' | 's3ObjectKey'>;
     };
+    permitType: PermitType | undefined;
   };
 };
diff --git a/tools/admin/permit-holders/permit-holders-table.ts b/tools/admin/permit-holders/permit-holders-table.ts
index 4b869562..d095e395 100644
--- a/tools/admin/permit-holders/permit-holders-table.ts
+++ b/tools/admin/permit-holders/permit-holders-table.ts
@@ -2,11 +2,9 @@ import { gql } from '@apollo/client'; // gql tag
 import {
   ApplicantsFilter,
   Applicant,
-  DeleteApplicantResult,
   Permit,
   PermitStatus,
   ApplicantStatus,
-  MutationDeleteApplicantArgs,
   MutationSetApplicantAsInactiveArgs,
   SetApplicantAsInactiveResult,
   MutationSetApplicantAsActiveArgs,
@@ -131,17 +129,3 @@ export type SetApplicantAsActiveRequest = MutationSetApplicantAsActiveArgs;
 export type SetApplicantAsActiveResponse = {
   setApplicantAsActive: SetApplicantAsActiveResult;
 };
-
-export const DELETE_APPLICANT = gql`
-  mutation deleteApplicant($input: DeleteApplicantInput!) {
-    deleteApplicant(input: $input) {
-      ok
-    }
-  }
-`;
-
-export type DeleteApplicantRequest = MutationDeleteApplicantArgs;
-
-export type DeleteApplicantResponse = {
-  deleteApplicant: DeleteApplicantResult;
-};
diff --git a/tools/admin/permit-holders/view-permit-holder.ts b/tools/admin/permit-holders/view-permit-holder.ts
index ac0f6549..b5bcf65b 100644
--- a/tools/admin/permit-holders/view-permit-holder.ts
+++ b/tools/admin/permit-holders/view-permit-holder.ts
@@ -91,7 +91,6 @@ export const GET_APPLICANT_QUERY = gql`
         application {
           id
           type
-          permitType
           processing {
             documentsUrl
             documentsS3ObjectKey
@@ -100,6 +99,9 @@ export const GET_APPLICANT_QUERY = gql`
               s3ObjectKey
             }
           }
+          ... on NewApplication {
+            permitType
+          }
         }
       }
     }
diff --git a/tools/admin/requests/delete-request-modal.ts b/tools/admin/requests/delete-request-modal.ts
deleted file mode 100644
index ea4a1cbb..00000000
--- a/tools/admin/requests/delete-request-modal.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { gql } from '@apollo/client';
-import { DeleteApplicationResult, MutationDeleteApplicationArgs } from '@lib/graphql/types';
-
-export const DELETE_APPLICATION_MUTATION = gql`
-  mutation deleteApplication($input: DeleteApplicationInput!) {
-    deleteApplication(input: $input) {
-      ok
-    }
-  }
-`;
-
-// Delete application request type
-export type DeleteApplicationRequest = MutationDeleteApplicationArgs;
-
-// Delete application response type
-export type DeleteApplicationResponse = {
-  deleteApplication: DeleteApplicationResult;
-};
diff --git a/tools/admin/requests/processing-tasks-card.ts b/tools/admin/requests/processing-tasks-card.ts
index 0fadca2f..7b698199 100644
--- a/tools/admin/requests/processing-tasks-card.ts
+++ b/tools/admin/requests/processing-tasks-card.ts
@@ -30,7 +30,6 @@ export const GET_APPLICATION_PROCESSING = gql`
       paidThroughShopify
       shopifyConfirmationNumber
       shopifyOrderNumber
-      donationAmount
       processing {
         status
         appNumber
@@ -95,7 +94,7 @@ export type GetApplicationProcessingRequest = QueryApplicationArgs;
 export type GetApplicationProcessingResponse = {
   application: Pick<
     Application,
-    'paidThroughShopify' | 'shopifyConfirmationNumber' | 'shopifyOrderNumber' | 'donationAmount'
+    'paidThroughShopify' | 'shopifyConfirmationNumber' | 'shopifyOrderNumber'
   > & {
     processing: Pick<
       ApplicationProcessing,
diff --git a/tools/admin/requests/view-request.ts b/tools/admin/requests/view-request.ts
index a3960bab..fa8c05c4 100644
--- a/tools/admin/requests/view-request.ts
+++ b/tools/admin/requests/view-request.ts
@@ -40,9 +40,6 @@ export const GET_APPLICATION_QUERY = gql`
       }
       applicant {
         id
-        mostRecentPermit {
-          expiryDate
-        }
       }
       permit {
         expiryDate
@@ -80,9 +77,7 @@ export type GetApplicationResponse = {
     > & {
       invoice: Pick<Invoice, 'invoiceNumber' | 's3ObjectKey' | 's3ObjectUrl'>;
     };
-    applicant: Pick<Applicant, 'id'> & {
-      mostRecentPermit: Pick<Permit, 'expiryDate'> | null;
-    };
+    applicant: Pick<Applicant, 'id'>;
     temporaryPermitExpiry?: Date;
     permit: Pick<Permit, 'expiryDate'> | null;
   };