diff --git a/eslint.config.mjs b/eslint.config.mjs
index a44c623b55d..35fd03f40b7 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -66,7 +66,7 @@ export default [
     rules: {
       ...tseslint.configs.recommended.rules,
       "@typescript-eslint/no-unused-vars": [
-        "warn",
+        "error",
         {
           argsIgnorePattern: "^_",
           varsIgnorePattern: "^_",
@@ -74,7 +74,7 @@ export default [
         },
       ],
       "@typescript-eslint/no-unused-expressions": [
-        "warn",
+        "error",
         { allowShortCircuit: true, allowTernary: true },
       ],
       "@typescript-eslint/no-explicit-any": "warn",
diff --git a/src/components/Questionnaire/CloneQuestionnaireSheet.tsx b/src/components/Questionnaire/CloneQuestionnaireSheet.tsx
index 3d8df981f99..2f53e2a9dfb 100644
--- a/src/components/Questionnaire/CloneQuestionnaireSheet.tsx
+++ b/src/components/Questionnaire/CloneQuestionnaireSheet.tsx
@@ -197,7 +197,7 @@ export default function CloneQuestionnaireSheet({
           </div>
         </div>
 
-        <SheetFooter className="absolute bottom-0 left-0 right-0 p-4 border-t bg-background">
+        <SheetFooter className="absolute bottom-0 left-0 right-0 p-4 border-t">
           <div className="flex w-full justify-end gap-4">
             <Button
               variant="outline"
diff --git a/src/components/Questionnaire/ManageQuestionnaireOrganizationsSheet.tsx b/src/components/Questionnaire/ManageQuestionnaireOrganizationsSheet.tsx
index 8d405641b04..d16dff7b547 100644
--- a/src/components/Questionnaire/ManageQuestionnaireOrganizationsSheet.tsx
+++ b/src/components/Questionnaire/ManageQuestionnaireOrganizationsSheet.tsx
@@ -202,7 +202,7 @@ export default function ManageQuestionnaireOrganizationsSheet({
           </div>
         </div>
 
-        <SheetFooter className="absolute bottom-0 left-0 right-0 p-4 border-t bg-background">
+        <SheetFooter className="absolute bottom-0 left-0 right-0 p-4 border-t">
           <div className="flex w-full justify-end gap-4">
             <Button
               variant="outline"
diff --git a/src/components/Questionnaire/ManageQuestionnaireTagsSheet.tsx b/src/components/Questionnaire/ManageQuestionnaireTagsSheet.tsx
index 9980b5a5881..6390464000d 100644
--- a/src/components/Questionnaire/ManageQuestionnaireTagsSheet.tsx
+++ b/src/components/Questionnaire/ManageQuestionnaireTagsSheet.tsx
@@ -23,7 +23,7 @@ import {
 } from "@/components/ui/command";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
+import { ScrollArea } from "@/components/ui/scroll-area";
 import {
   Sheet,
   SheetContent,
@@ -280,8 +280,8 @@ export default function ManageQuestionnaireTagsSheet({
           </ScrollArea>
         </div>
 
-        <SheetFooter className=" bottom-0 left-0 right-0 p-4 border-t bg-background">
-          <div className="flex w-full justify-end gap-4">
+        <SheetFooter className=" bottom-0 left-0 right-0 p-4 border-t">
+          <div className="flex w-full justify-end gap-4 bg-gray-100">
             <Button
               variant="outline"
               onClick={() => {
diff --git a/src/components/Questionnaire/QuestionnaireEditor.tsx b/src/components/Questionnaire/QuestionnaireEditor.tsx
index 950ff204b3f..2a6421ffb77 100644
--- a/src/components/Questionnaire/QuestionnaireEditor.tsx
+++ b/src/components/Questionnaire/QuestionnaireEditor.tsx
@@ -64,7 +64,6 @@ import query from "@/Utils/request/query";
 import organizationApi from "@/types/organization/organizationApi";
 import {
   EnableWhen,
-  ObservationType,
   Question,
   QuestionType,
   SUPPORTED_QUESTION_TYPES,
@@ -106,11 +105,6 @@ interface Organization {
   description?: string;
 }
 
-interface StylingMetadata {
-  classes?: string;
-  containerClasses?: string;
-}
-
 interface OrganizationResponse {
   results: Organization[];
 }
@@ -451,7 +445,6 @@ function QuestionnaireProperties({
   id,
   organizations,
   organizationSelection,
-  tags,
   tagSelection,
 }: QuestionnairePropertiesProps) {
   return (
@@ -613,7 +606,6 @@ export default function QuestionnaireEditor({ id }: QuestionnaireEditorProps) {
   const [selectedTagIds, setSelectedTagIds] = useState<string[]>([]);
   const [orgSearchQuery, setOrgSearchQuery] = useState("");
   const [tagSearchQuery, setTagSearchQuery] = useState("");
-  const [observation, setObservation] = useState<ObservationType | undefined>();
 
   const {
     data: initialQuestionnaire,
@@ -627,7 +619,7 @@ export default function QuestionnaireEditor({ id }: QuestionnaireEditorProps) {
     enabled: !!id,
   });
 
-  const { data: organizations, isLoading: isLoadingOrganizations } = useQuery({
+  const { data: organizations } = useQuery({
     queryKey: ["questionnaire", id, "organizations"],
     queryFn: query(questionnaireApi.getOrganizations, {
       pathParams: { id: id! },
diff --git a/src/components/Resource/ResourceForm.tsx b/src/components/Resource/ResourceForm.tsx
index fb93e88e316..bc4981b2ab9 100644
--- a/src/components/Resource/ResourceForm.tsx
+++ b/src/components/Resource/ResourceForm.tsx
@@ -543,7 +543,7 @@ export default function ResourceForm({ facilityId, id }: ResourceProps) {
                   </div>
                 </div>
 
-                <div className="sticky bottom-0 flex justify-end gap-4 border-t bg-background pt-4">
+                <div className="sticky bottom-0 flex justify-end gap-4 border-t pt-4">
                   <Button
                     type="button"
                     variant="outline"
diff --git a/src/pages/Encounters/tabs/EncounterNotesTab.tsx b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
index 058606392e4..f3825c2cfe0 100644
--- a/src/pages/Encounters/tabs/EncounterNotesTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
@@ -472,7 +472,7 @@ export const EncounterNotesTab = ({ encounter }: EncounterTabProps) => {
   return (
     <div className="flex h-[calc(100vh-12rem)]">
       {/* Desktop Sidebar */}
-      <div className="hidden lg:flex lg:w-80 lg:flex-col lg:border-r bg-background">
+      <div className="hidden lg:flex lg:w-80 lg:flex-col lg:border-r">
         <div className="p-4 border-b">
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-2">
@@ -575,7 +575,7 @@ export const EncounterNotesTab = ({ encounter }: EncounterTabProps) => {
       <div className="flex-1 min-w-0">
         <div className="flex flex-col h-full pb-[60px] lg:pb-0">
           {/* Header */}
-          <div className="p-4 border-b bg-background sticky top-0 z-10">
+          <div className="p-4 border-b sticky top-0 z-10">
             {selectedThread ? (
               <div className="flex items-center gap-3">
                 <h2 className="text-base font-medium truncate flex-1">
@@ -653,7 +653,7 @@ export const EncounterNotesTab = ({ encounter }: EncounterTabProps) => {
                     </div>
                   </ScrollArea>
                   {/* Message Input */}
-                  <div className="border-t bg-background p-4 sticky bottom-0">
+                  <div className="border-t p-4 sticky bottom-0">
                     <form onSubmit={handleSendMessage}>
                       <div className="flex gap-2">
                         <Textarea