diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java
index eed0a4801c..4dbd3d847a 100644
--- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java
+++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java
@@ -84,8 +84,6 @@ public synchronized X509Certificate getCacheValue(String serialNumber) {
     @Override
     public ManageableCacheValue getNextCacheValue() {
 
-        //changes to the map are reflected on the keySet. And its iterator is weakly consistent. so will never
-        //throw concurrent modification exception.
         if (iterator.hasNext()) {
             return hashMap.get(iterator.next().getKey());
         } else {
@@ -135,7 +133,7 @@ public synchronized void removeCacheValue(String serialNumber) {
     }
 
     /**
-     * This is the wrapper class of the actual cache value which is a X509CRL.
+     * This is the wrapper class of the actual cache value.
      */
     private class CertCacheValue implements ManageableCacheValue {
 
@@ -159,9 +157,6 @@ public String getKey() {
             return serialNumber;
         }
 
-        /**
-         * CRL has a validity period. We can reuse a downloaded CRL within that period.
-         */
         public boolean isValid() {
 
             // Will be always return true since we only set defined data.
diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java
index 7f59f0b162..697dd6eba6 100644
--- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java
+++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java
@@ -43,10 +43,12 @@ public static TrustStoreHolder getInstance() {
     }
 
     public KeyStore getClientTrustStore() {
+
         return clientTrustStore;
     }
 
     public void setClientTrustStore(KeyStore clientTrustStore) {
+
         this.clientTrustStore = clientTrustStore;
     }
 
diff --git a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties
deleted file mode 100644
index ccabbbabad..0000000000
--- a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-t-0-1704257728276.txt 03/01/2024/ 10:25:28
-in 03/01/2024/ 13:29:16
-t-0-1704268757607.txt 03/01/2024/ 13:29:17
-t-0-1704336995522.txt 04/01/2024/ 08:26:35