diff --git a/Frontend/lib/mih_env/env.dart b/Frontend/lib/mih_env/env.dart
index 903bcfe5..842552b8 100644
--- a/Frontend/lib/mih_env/env.dart
+++ b/Frontend/lib/mih_env/env.dart
@@ -15,13 +15,13 @@ abstract class AppEnviroment {
       case Enviroment.dev:
         {
           //================= Android Dev Urls =================
-          // baseApiUrl = "http://10.0.2.2:8080";
-          // baseFileUrl = "http://10.0.2.2:9000";
-          // baseAiUrl = "http://10.0.2.2:11434";
+          baseApiUrl = "http://10.0.2.2:8080";
+          baseFileUrl = "http://10.0.2.2:9000";
+          baseAiUrl = "http://10.0.2.2:11434";
           //================= Web Dev Urls =================
-          baseApiUrl = "http://localhost:8080";
-          baseFileUrl = "http://localhost:9000";
-          baseAiUrl = "http://localhost:11434";
+          // baseApiUrl = "http://localhost:8080";
+          // baseFileUrl = "http://localhost:9000";
+          // baseAiUrl = "http://localhost:11434";
           break;
         }
       case Enviroment.prod:
diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window2.dart
similarity index 99%
rename from Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart
rename to Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window2.dart
index cb06b1e3..b203a658 100644
--- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window2.dart
@@ -126,11 +126,6 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                   return MihValidationServices().isEmpty(value);
                 },
               ),
-              // MIHDateField(
-              //   controller: _serviceDateController,
-              //   lableText: "Date of Service",
-              //   required: true,
-              // ),
               const SizedBox(height: 10),
               MihRadioOptions(
                 controller: _serviceDescController,
diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart
index 82b5c932..6721e147 100644
--- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart
@@ -10,7 +10,7 @@ import 'package:mzansi_innovation_hub/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business_user.dart';
 import 'package:mzansi_innovation_hub/mih_objects/claim_statement_file.dart';
 import 'package:mzansi_innovation_hub/mih_objects/patients.dart';
-import 'package:mzansi_innovation_hub/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart';
+import 'package:mzansi_innovation_hub/mih_packages/patient_profile/pat_profile/components/claim_statement_window2.dart';
 import 'package:mzansi_innovation_hub/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart';
 import 'package:flutter/material.dart';