diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/AgentServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/AgentServiceImpl.java
index e399b8c..5a25314 100644
--- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/AgentServiceImpl.java
+++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/AgentServiceImpl.java
@@ -141,7 +141,7 @@ public class AgentServiceImpl implements AgentService {
 			billFetchByBillIdRequest.setReqId(requestId);
 			LOGGER.info("Waiting for 2 seconds before fetching bill by ID...");
 			try {
-				Thread.sleep(1000);
+				Thread.sleep(5000);
 			} catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 				LOGGER.warn("Thread interrupted during delay: {}", e.getMessage());
@@ -162,7 +162,7 @@ public class AgentServiceImpl implements AgentService {
 		String txnId = helper.generateTxnId(15);
 		String reqId = billFetchByBillIdRequest.getReqId();
 		String billId = billFetchByBillIdRequest.getBillId();
-		String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
+		String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + billFetchByBillIdRequest.getBillId();
 
 		helper.validateMerchant(billFetchByBillIdRequest.getMid());
 
diff --git a/src/main/java/com/billpaymentservice/bbps/util/Helper.java b/src/main/java/com/billpaymentservice/bbps/util/Helper.java
index 624b31c..e9b9291 100644
--- a/src/main/java/com/billpaymentservice/bbps/util/Helper.java
+++ b/src/main/java/com/billpaymentservice/bbps/util/Helper.java
@@ -247,48 +247,6 @@ public class Helper {
 	public void saveOrUpdateBillerData(BillDataResponse responseWrapper,
             BillFetchByBillIdRequest billFetchByBillIdRequest) {
 
-// ------------------------------------------------------------
-// 🔥 1. STATIC ADDITIONAL INFO LIST (overwrite before mapping)
-// ------------------------------------------------------------
-List<AdditionalInfoBillDTO> staticAdditional = new ArrayList<>();
-
-staticAdditional.add(new AdditionalInfoBillDTO("123", "Student Name", "AGAMJOT TEST "));
-staticAdditional.add(new AdditionalInfoBillDTO("333", "Father Name", "VIRENDER SINGH"));
-staticAdditional.add(new AdditionalInfoBillDTO("908", "Class", "STD I"));
-staticAdditional.add(new AdditionalInfoBillDTO("097", "Section", "A"));
-staticAdditional.add(new AdditionalInfoBillDTO("321", "TUITION FEE", "8670"));
-staticAdditional.add(new AdditionalInfoBillDTO("121", "E-CARE FEE", "900"));
-staticAdditional.add(new AdditionalInfoBillDTO("111", "COMPUTER FEE", "1350"));
-staticAdditional.add(new AdditionalInfoBillDTO("121", "EXAM FEE", "500"));
-
-// Static set (overwrite)
-responseWrapper.setAdditionalInfo(staticAdditional);
-
-
-
-// ------------------------------------------------------------
-// 🔥 2. STATIC CUSTOMER PARAMS LIST (overwrite before mapping)
-// ------------------------------------------------------------
-List<CustomerParamDAO> staticCustomerParams = new ArrayList<>();
-
-staticCustomerParams.add(new CustomerParamDAO(
-"Admission No/Application No/GR No", "LF3130", "test"
-));
-
-staticCustomerParams.add(new CustomerParamDAO(
-"Date Of Birth (DD-MM-YYYY)", "10/08/2000", "test"
-));
-
-staticCustomerParams.add(new CustomerParamDAO(
-"Mobile No", "9241842248", "test"
-));
-
-// Static set (overwrite)
-responseWrapper.setCustomerParams(staticCustomerParams);
-
-// ------------------------------------------------------------
-// 🔥 REST OF YOUR ORIGINAL LOGIC — NO CHANGE
-// ------------------------------------------------------------
 
 BillMaster billMaster = new BillMaster();
 
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index 17c421e..b9b1818 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -20,9 +20,9 @@ swagger.server.description=Local Development Server
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
-spring.datasource.password=UAT@DB_2025
+#spring.datasource.password=UAT@DB_2025
 
-#spring.datasource.password=himanshu@123
+spring.datasource.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource