diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 5dba61b..67995af 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,9 +13,6 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="ecr-service">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b1cbee4..d0d4139 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/baselib" />
             <option value="$PROJECT_DIR$/ecr" />
-            <option value="$PROJECT_DIR$/ecr-client-lib" />
             <option value="$PROJECT_DIR$/ecr-service" />
             <option value="$PROJECT_DIR$/ecr-service-lib" />
             <option value="$PROJECT_DIR$/link-service-lib" />
diff --git a/app/build.gradle b/app/build.gradle
index f592969..274ea31 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -203,7 +203,7 @@ dependencies {
 
 
     // ECR Dependencies - Modern ECR Client Library
-    implementation project(path: ':ecr-client-lib')
+//    implementation project(path: ':ecr-client-lib')
     implementation project(path: ':ecr-service-lib')
     
     // Core Libraries
diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java
index acad317..bcb373c 100644
--- a/app/src/main/java/com/utsmm/kbz/MainFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java
@@ -80,8 +80,8 @@ import dagger.hilt.android.AndroidEntryPoint;
 import com.utsmyanmar.paylibs.utils.LogUtil;
 import com.utsmyanmar.paylibs.utils.params.Params;
 
-import com.utsmm.kbz.util.ecr.ModernECRFactory;
-import com.utsmm.kbz.util.ecr.ModernECRManager;
+//import com.utsmm.kbz.util.ecr.ModernECRFactory;
+//import com.utsmm.kbz.util.ecr.ModernECRManager;
 import androidx.lifecycle.ViewModelProvider;
 
 @AndroidEntryPoint
@@ -91,7 +91,7 @@ public class MainFragment extends DataBindingFragment {
     private SharedViewModel sharedViewModel;
     private MainViewModel mainViewModel;
     private TMSProcessViewModel tmsProcessViewModel;
-    private ModernECRManager modernECRManager;
+//    private ModernECRManager modernECRManager;
     private int routeId;
     private ImageSlider imgSlider;
     private final ArrayList<SlideModel> imgList = new ArrayList<>();
@@ -123,8 +123,8 @@ public class MainFragment extends DataBindingFragment {
         tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class);
         
         // Initialize ModernECRManager
-        ModernECRFactory factory = new ModernECRFactory(requireContext(), sharedViewModel);
-        modernECRManager = new ViewModelProvider(this, factory).get(ModernECRManager.class);
+//        ModernECRFactory factory = new ModernECRFactory(requireContext(), sharedViewModel);
+//        modernECRManager = new ViewModelProvider(this, factory).get(ModernECRManager.class);
     }
 
     @Override
@@ -246,10 +246,13 @@ public class MainFragment extends DataBindingFragment {
         }
         sharedViewModel.setManualEntryStatus(SystemParamsOperation.getInstance().getManualEntryStatus());
 
+        queryAidCAPKList();
 
 //        generateMockQR();
     }
 
+
+
     /*
      *  @param
      *
@@ -289,14 +292,14 @@ public class MainFragment extends DataBindingFragment {
     private void setUpECR() {
         if (checkECRServiceAppExistOrNot()) {
             // Initialize Modern ECR Manager
-            modernECRManager.init();
-            
-            // Observe navigation requests
-            modernECRManager.getNavigationRequest().observe(getViewLifecycleOwner(), destinationId -> {
-                if (destinationId != null) {
-                    delayFunctionCall(() -> isRouteValidAndNavigateToRoute(destinationId));
-                }
-            });
+//            modernECRManager.init();
+//
+//            // Observe navigation requests
+//            modernECRManager.getNavigationRequest().observe(getViewLifecycleOwner(), destinationId -> {
+//                if (destinationId != null) {
+//                    delayFunctionCall(() -> isRouteValidAndNavigateToRoute(destinationId));
+//                }
+//            });
             
             showShortToast("ECR Service initialized");
         } else {
diff --git a/settings.gradle b/settings.gradle
index 4ee64ae..460fa7a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ include ':paylibs'
 include ':baselib'
 include ':mpulib'
 
-include ':ecr-client-lib'
+//include ':ecr-client-lib'
 include ':ecr-service'
 include ':xpay'
 include ':ecr'