diff --git a/src/frontend/src/pages/batchView.tsx b/src/frontend/src/pages/batchView.tsx
index 87d6cdda..5afcdb03 100644
--- a/src/frontend/src/pages/batchView.tsx
+++ b/src/frontend/src/pages/batchView.tsx
@@ -73,7 +73,6 @@ const BatchStoryPage = () => {
   const [selectedFileId, setSelectedFileId] = useState<string>("");
   const [expandedSections, setExpandedSections] = useState(["errors"]);
   const [batchSummary, setBatchSummary] = useState<BatchSummary | null>(null);
-  const [selectedFileContent, setSelectedFileContent] = useState<string>("");
   const [selectedFileTranslatedContent, setSelectedFileTranslatedContent] = useState<string>("");
 
 
@@ -195,7 +194,6 @@ const BatchStoryPage = () => {
         const data = await response.json();
 
         if (data) {
-          setSelectedFileContent(data.content || "");
           setSelectedFileTranslatedContent(data.translated_content || "");
         }
 
diff --git a/src/frontend/src/pages/modernizationPage.tsx b/src/frontend/src/pages/modernizationPage.tsx
index 66c03dd6..53f128b5 100644
--- a/src/frontend/src/pages/modernizationPage.tsx
+++ b/src/frontend/src/pages/modernizationPage.tsx
@@ -497,7 +497,6 @@ const ModernizationPage = () => {
   const [fileId, setFileId] = React.useState<string>("");
   const [expandedSections, setExpandedSections] = React.useState<string[]>([]);
   const [allFilesCompleted, setAllFilesCompleted] = useState(false);
-  const [progressPercentage, setProgressPercentage] = useState(0);
   const [isZipButtonDisabled, setIsZipButtonDisabled] = useState(true);
   const [fileLoading, setFileLoading] = useState(false);
   const [lastActivityTime, setLastActivityTime] = useState<number>(Date.now());
@@ -1014,16 +1013,16 @@ useEffect(() => {
     };
   }, [handleWebSocketMessage]);
 
-  // Set a timeout for initial loading - if no progress after 30 seconds, show error
+  // Set a timeout for initial loading - if still loading after 30 seconds, show a warning message
   useEffect(() => {
     const loadingTimeout = setTimeout(() => {
-      if (progressPercentage < 5 && showLoading) {
+      if (showLoading) {
         setLoadingError('Processing is taking longer than expected. You can continue waiting or try again later.');
       }
     }, 30000);
 
     return () => clearTimeout(loadingTimeout);
-  }, [progressPercentage, showLoading]);
+  }, [showLoading]);
 
   // Add timeout mechanism to navigate if no activity for 30 seconds
   useEffect(() => {
diff --git a/src/tests/backend/sql_agents/convert_script_test.py b/src/tests/backend/sql_agents/convert_script_test.py
index b0b16baa..4fc71392 100644
--- a/src/tests/backend/sql_agents/convert_script_test.py
+++ b/src/tests/backend/sql_agents/convert_script_test.py
@@ -187,7 +187,7 @@ async def test_convert_script_cleanup_always_runs(self):
                         mock_sql_agents
                     )
                 except RuntimeError:
-                    pass
+                    pass  # Expected exception; verifying cleanup below
 
                 # Cleanup should be called even on exception
                 mock_comms_manager.cleanup.assert_called_once()
diff --git a/tests/e2e-test/pages/HomePage.py b/tests/e2e-test/pages/HomePage.py
index a1afff95..97b2d937 100644
--- a/tests/e2e-test/pages/HomePage.py
+++ b/tests/e2e-test/pages/HomePage.py
@@ -52,7 +52,7 @@ class HomePage(BasePage):
     HARMFUL_FILE_2 = "//span[.='harmful_content_2 2.sql']"
 
     def __init__(self, page):
-        self.page = page
+        super().__init__(page)
 
     def navigate_to_base_url(self):
         """
diff --git a/tests/e2e-test/pages/loginPage.py b/tests/e2e-test/pages/loginPage.py
index 0b412556..2fdad149 100644
--- a/tests/e2e-test/pages/loginPage.py
+++ b/tests/e2e-test/pages/loginPage.py
@@ -11,7 +11,7 @@ class LoginPage(BasePage):
     PERMISSION_ACCEPT_BUTTON = "//input[@type='submit']"
 
     def __init__(self, page):
-        self.page = page
+        super().__init__(page)
 
     def authenticate(self, username, password):
         # login with username and password in web url