diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/description/config/MongoConfig.java b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/description/config/MongoConfig.java
index c868eae998..3e0381be83 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/description/config/MongoConfig.java
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/description/config/MongoConfig.java
@@ -88,7 +88,6 @@ public MongoClient createNewMongo(MongoClientSettings mongoClientSettings) throw
     @Override
     public boolean isActive() {
         try {
-            // TODO: Need to check the connection availability properly.
             MongoClient mongo = this.createNewMongo(this.mongoClientSettings);
             return mongo != null;
         } catch (Exception e) {
@@ -108,7 +107,8 @@ public ODataDataHandler createODataHandler() {
     }
 
     private MongoClientSettings extractMongoOptions(Map<String, String> properties, String writeConcern,
-                                                    String readPref, List<ServerAddress> serverAddresses, MongoCredential mongoCredentials) {
+                                                    String readPref, List<ServerAddress> serverAddresses,
+                                                    MongoCredential mongoCredentials) {
         MongoClientSettings.Builder settingsBuilder = MongoClientSettings.builder();
         String connectionsPerHost = properties.get(DBConstants.MongoDB.CONNECTIONS_PER_HOST);
         if (!DBUtils.isEmptyString(connectionsPerHost)) {
diff --git a/pom.xml b/pom.xml
index aa90d5862c..2d6efed340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1809,10 +1809,7 @@
         <carbon.registry.imp.pkg.version>0.0.0</carbon.registry.imp.pkg.version> <!-- todo remove this and use {carbon.kernel.imp.pkg.version} after registry bundles are corrected to export correct versions-->
 
         <mongodb-driver-sync.orbit.version>4.9.1</mongodb-driver-sync.orbit.version>
-        <mongodb-driver-sync.orbit.imp.pkg.version>[4.0.0,6.0.0)</mongodb-driver-sync.orbit.imp.pkg.version> <!--todo change this to appropriate version range ([2.11.4.wso2v1,2.12.0)) after osgi bundle is corrected - rajith-->
-
-<!--        <jongo.orbit.version>1.4.0.wso2v1</jongo.orbit.version>-->
-<!--        <jongo.orbit.imp.pkg.version>[1.4,1.5)</jongo.orbit.imp.pkg.version>-->
+        <mongodb-driver-sync.orbit.imp.pkg.version>[4.0.0,6.0.0)</mongodb-driver-sync.orbit.imp.pkg.version>
 
         <dataservices.version>4.4.107</dataservices.version>
         <dataservices.imp.pkg.version>[4.3.0,5.0.0)</dataservices.imp.pkg.version>