diff --git a/.idea/runConfigurations/enviroPro.xml b/.idea/runConfigurations/enviroPro.xml
deleted file mode 100644
index 7e4d3f8f..00000000
--- a/.idea/runConfigurations/enviroPro.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="enviroPro" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/enviroPro/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="dev" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs>
-      <env name="VITE_HT_API_URL" value="http://localhost:8000" />
-      <env name="VITE_HT_ENV" value="DEV" />
-    </envs>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/client/eslint.config.js b/client/eslint.config.js
index 6e9d2061..30cf2c07 100644
--- a/client/eslint.config.js
+++ b/client/eslint.config.js
@@ -1,7 +1,7 @@
 import reactPlugin from 'eslint-plugin-react'; // https://github.com/jsx-eslint/eslint-plugin-react?tab=readme-ov-file#configuration
 import globals from 'globals';
 import pluginJs from '@eslint/js';
-import tseslint from 'typescript-eslint';
+import tsEslint from 'typescript-eslint';
 import jsxA11y from 'eslint-plugin-jsx-a11y';
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
 
@@ -9,9 +9,9 @@ export default [
   // ToDo: eslint-plugin-react-hooks does not yet support eslint > 9 and this config
   pluginJs.configs.recommended,
   jsxA11y.flatConfigs.recommended,
-  // ...tseslint.configs.recommended,
-  ...tseslint.configs.strict,
-  ...tseslint.configs.stylistic,
+  // ...tseslint.configs.recommended, // recommended config is overridden by strict/stylistic
+  ...tsEslint.configs.strict,
+  ...tsEslint.configs.stylistic,
   eslintPluginPrettierRecommended,
   {
     name: 'ignore-outputs',
@@ -39,6 +39,7 @@ export default [
     rules: {
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/no-empty-interface': 'off',
+      '@typescript-eslint/no-empty-function': 'off',
     },
   },
   {
diff --git a/client/src/components/Manifest/Actions/ManifestFABs.tsx b/client/src/components/Manifest/Actions/ManifestFABs.tsx
index 316a1ac8..69797f63 100644
--- a/client/src/components/Manifest/Actions/ManifestFABs.tsx
+++ b/client/src/components/Manifest/Actions/ManifestFABs.tsx
@@ -5,21 +5,19 @@ import { QuickSignBtn } from 'components/Manifest/QuickerSign';
 import { FloatingActionBtn } from 'components/UI';
 import { useReadOnly } from 'hooks/manifest';
 import React, { ReactElement, useContext } from 'react';
-import { manifest } from 'services';
 
 interface ManifestActionBtnsProps {
   onSignClick: () => void;
 }
 
 export function ManifestFABs({ onSignClick }: ManifestActionBtnsProps) {
-  const { nextSigningSite, signAble } = useContext(ManifestContext);
+  const { signAble } = useContext(ManifestContext);
   const [readOnly] = useReadOnly();
-  const rcraSiteType = manifest.siteTypeToRcraSiteType(nextSigningSite?.siteType);
   let component: ReactElement | undefined = undefined;
   if (!readOnly) {
     component = <ManifestSaveBtn />;
   } else if (signAble) {
-    component = <QuickSignBtn siteType={rcraSiteType} onClick={onSignClick} />;
+    component = <QuickSignBtn onClick={onSignClick} />;
   } else if (readOnly) {
     component = <ManifestEditBtn />;
   } else {
diff --git a/client/src/components/Manifest/Generator/GeneratorSection.tsx b/client/src/components/Manifest/Generator/GeneratorSection.tsx
index b0e95d99..0e00b99c 100644
--- a/client/src/components/Manifest/Generator/GeneratorSection.tsx
+++ b/client/src/components/Manifest/Generator/GeneratorSection.tsx
@@ -29,7 +29,7 @@ export function GeneratorSection({ setupSign, signAble }: GeneratorSectionProps)
   const toggleShowGeneratorForm = () => setShowGeneratorForm(!showGeneratorForm);
   const urlGeneratorId = searchParams.get('generator');
 
-  const { data, isLoading, error } = useGetRcrainfoSiteQuery(urlGeneratorId, {
+  const { data, isLoading, error } = useGetRcrainfoSiteQuery(urlGeneratorId ?? '', {
     skip: !urlGeneratorId,
   });
 
@@ -72,7 +72,6 @@ export function GeneratorSection({ setupSign, signAble }: GeneratorSectionProps)
           <div className="d-flex justify-content-between">
             <Col className="text-end">
               <QuickSignBtn
-                siteType={'Generator'}
                 mtnHandler={generator}
                 onClick={setupSign}
                 disabled={generator?.signed || !signAble}
diff --git a/client/src/components/Manifest/ManifestForm.tsx b/client/src/components/Manifest/ManifestForm.tsx
index b91dfc11..f6199a5e 100644
--- a/client/src/components/Manifest/ManifestForm.tsx
+++ b/client/src/components/Manifest/ManifestForm.tsx
@@ -50,13 +50,10 @@ export interface ManifestContextType {
 export const ManifestContext = createContext<ManifestContextType>({
   trackingNumber: undefined,
   generatorStateCode: undefined,
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   setGeneratorStateCode: () => {},
   tsdfStateCode: undefined,
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   setTsdfStateCode: () => {},
   editWasteLineIndex: undefined,
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   setEditWasteLineIndex: () => {},
   nextSigningSite: undefined,
   viewingAsSiteId: undefined,
diff --git a/client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx b/client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx
index 6d75c9d3..212f651b 100644
--- a/client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx
+++ b/client/src/components/Manifest/QuickerSign/SignBtn/QuickSignBtn.spec.tsx
@@ -16,7 +16,6 @@ beforeAll(() => server.listen());
 afterAll(() => server.close()); // Disable API mocking after the tests are done.
 
 function TestComponent({
-  siteType,
   handler,
   signingSite,
 }: {
@@ -28,7 +27,6 @@ function TestComponent({
     transporterOrder?: number | undefined;
   };
 }) {
-  if (!siteType) siteType = 'Generator';
   const setGeneratorStateCode = vi.fn();
   const setTsdfStateCode = vi.fn();
   const setEditWasteLineIndex = vi.fn();
@@ -43,7 +41,7 @@ function TestComponent({
           setEditWasteLineIndex,
         }}
       >
-        <QuickSignBtn siteType={siteType} mtnHandler={handler} onClick={() => undefined} />
+        <QuickSignBtn mtnHandler={handler} onClick={() => undefined} />
       </ManifestContext.Provider>
     </div>
   );
diff --git a/client/src/components/Manifest/Transporter/TransporterTable.tsx b/client/src/components/Manifest/Transporter/TransporterTable.tsx
index d7eeedee..539144a5 100644
--- a/client/src/components/Manifest/Transporter/TransporterTable.tsx
+++ b/client/src/components/Manifest/Transporter/TransporterTable.tsx
@@ -64,7 +64,6 @@ function TransporterTable({ transporters, arrayFieldMethods, setupSign }: Transp
                 <Col xs={2}>
                   {readOnly ? (
                     <QuickSignBtn
-                      siteType={'Transporter'}
                       mtnHandler={transporter}
                       onClick={setupSign}
                       iconOnly={true}
diff --git a/client/src/components/Manifest/Tsdf/TsdfSection.tsx b/client/src/components/Manifest/Tsdf/TsdfSection.tsx
index b0909efc..8a6d47f1 100644
--- a/client/src/components/Manifest/Tsdf/TsdfSection.tsx
+++ b/client/src/components/Manifest/Tsdf/TsdfSection.tsx
@@ -26,7 +26,7 @@ export function TsdfSection({ signAble, setupSign }: TsdfSectionProps) {
   const tsdf: Handler | undefined = manifestForm.watch('designatedFacility');
   const [readOnly] = useReadOnly();
   const urlTsdfId = searchParams.get('tsdf');
-  const { data, isLoading, error } = useGetRcrainfoSiteQuery(urlTsdfId, {
+  const { data, isLoading, error } = useGetRcrainfoSiteQuery(urlTsdfId ?? '', {
     skip: !urlTsdfId,
   });
 
@@ -68,7 +68,6 @@ export function TsdfSection({ signAble, setupSign }: TsdfSectionProps) {
             {/* Button to bring up the Quicker Sign modal*/}
             <Col className="text-end">
               <QuickSignBtn
-                siteType={'Tsdf'}
                 mtnHandler={tsdf}
                 onClick={setupSign}
                 disabled={tsdf.signed || !signAble}
diff --git a/client/src/hooks/useUserSiteIds/useUserSiteIds.tsx b/client/src/hooks/useUserSiteIds/useUserSiteIds.tsx
index d0a39b63..eec70cc1 100644
--- a/client/src/hooks/useUserSiteIds/useUserSiteIds.tsx
+++ b/client/src/hooks/useUserSiteIds/useUserSiteIds.tsx
@@ -21,7 +21,7 @@ export function useUserSiteIds() {
     []
   );
 
-  const { userSiteIds, ...rest } = useGetProfileQuery(null, {
+  const { userSiteIds, ...rest } = useGetProfileQuery(undefined, {
     selectFromResult: (result) => ({
       ...result,
       userSiteIds: selectUserSiteIds(result),
diff --git a/client/src/store/htApi.slice.ts b/client/src/store/htApi.slice.ts
index 72f1d7c8..ef721e33 100644
--- a/client/src/store/htApi.slice.ts
+++ b/client/src/store/htApi.slice.ts
@@ -92,7 +92,8 @@ export const haztrakApi = createApi({
         params: { epaId: data.siteId, siteType: data.siteType },
       }),
     }),
-    getRcrainfoSite: build.query<RcraSite, string | null>({
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    getRcrainfoSite: build.query<RcraSite, string | void>({
       query: (epaSiteId) => ({
         url: `rcrasite/${epaSiteId}`,
         method: 'get',
@@ -101,7 +102,8 @@ export const haztrakApi = createApi({
     getTaskStatus: build.query<TaskStatus, string>({
       query: (taskId) => ({ url: `task/${taskId}`, method: 'get' }),
     }),
-    getFedWasteCodes: build.query<Code[], null>({
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    getFedWasteCodes: build.query<Code[], void>({
       query: () => ({ url: 'waste/code/federal', method: 'get' }),
       providesTags: ['code'],
     }),
@@ -117,7 +119,8 @@ export const haztrakApi = createApi({
       query: (id) => ({ url: `org/${id}/sites`, method: 'get' }),
       providesTags: ['site'],
     }),
-    getUserHaztrakSites: build.query<HaztrakSite[], null>({
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    getUserHaztrakSites: build.query<HaztrakSite[], void>({
       query: () => ({ url: 'site', method: 'get' }),
       providesTags: ['site'],
     }),
diff --git a/client/src/store/userSlice/user.slice.ts b/client/src/store/userSlice/user.slice.ts
index 5b54abfe..f410a9fe 100644
--- a/client/src/store/userSlice/user.slice.ts
+++ b/client/src/store/userSlice/user.slice.ts
@@ -101,7 +101,8 @@ export const userApi = haztrakApi.injectEndpoints({
       }),
       invalidatesTags: ['auth'],
     }),
-    getUser: build.query<HaztrakUser, null>({
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    getUser: build.query<HaztrakUser, void>({
       query: () => ({
         url: 'user',
         method: 'GET',
@@ -116,7 +117,8 @@ export const userApi = haztrakApi.injectEndpoints({
       }),
       invalidatesTags: ['user'],
     }),
-    getProfile: build.query<ProfileSlice, null>({
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    getProfile: build.query<ProfileSlice, void>({
       query: () => ({
         url: 'profile',
         method: 'GET',
@@ -166,7 +168,8 @@ export const userApi = haztrakApi.injectEndpoints({
       }),
       invalidatesTags: ['rcrainfoProfile'],
     }),
-    syncRcrainfoProfile: build.mutation<TaskResponse, null>({
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    syncRcrainfoProfile: build.mutation<TaskResponse, void>({
       query: () => ({
         url: `rcrainfo-profile/sync`,
         method: 'POST',
diff --git a/client/src/test-utils/mock/mockUserEndpoints.ts b/client/src/test-utils/mock/mockUserEndpoints.ts
index 28b07358..1de5858e 100644
--- a/client/src/test-utils/mock/mockUserEndpoints.ts
+++ b/client/src/test-utils/mock/mockUserEndpoints.ts
@@ -36,7 +36,7 @@ export const mockUserEndpoints = [
   /** GET RCRAInfo profile */
   http.get(`${API_BASE_URL}/api/rcrainfo-profile/:username`, (info) => {
     const { username } = info.params;
-    if (!username) {
+    if (typeof username !== 'string') {
       return HttpResponse.json({}, { status: 404 });
     }
     const rcrainfoProfile = createMockRcrainfoProfileResponse({ user: username });