diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
index dab7945..ae6b145 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
@@ -193,14 +193,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         }
 
         ovsdbDao.removeAllSsids(ovsdbClient); // always
-        //TODO turn on when RRM is ready
-//        ovsdbDao.removeWifiRrm(ovsdbClient);
+        ovsdbDao.removeWifiRrm(ovsdbClient);
 
         if (opensyncAPConfig != null) {
             ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
             ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
-            //TODO turn on when RRM is ready
-//            ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
+            ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
         }
 
         ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
@@ -262,14 +260,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         }
 
         ovsdbDao.removeAllSsids(ovsdbClient); // always
-        //TODO turn on when RRM is ready
-//        ovsdbDao.removeWifiRrm(ovsdbClient);
+        ovsdbDao.removeWifiRrm(ovsdbClient);
         ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
 
         ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
-        //TODO turn on when RRM is ready
-//        ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
+        ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
         ovsdbDao.configureStats(ovsdbClient);
 
         // Check if device stats is configured in Wifi_Stats_Config table,
diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
index 4dfc42a..3ccba3f 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
@@ -3235,17 +3235,12 @@ public class OvsdbDao {
                 } catch (TimeoutException e) {
                     LOG.error("configureRrm failed with Timeout.", e);
                     throw new RuntimeException(e);
-
                 } catch (ExecutionException e) {
                     LOG.error("configureRrm excecution failed.", e);
-                    throw new RuntimeException(e);
-
                 } catch (InterruptedException e) {
                     LOG.error("configureRrm interrupted.", e);
                     throw new RuntimeException(e);
-
                 }
-
             }
         }
     }
@@ -3338,7 +3333,9 @@ public class OvsdbDao {
 
             LOG.info("Removed Wifi_RRM_Config");
 
-        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
+        } catch (ExecutionException  e) {
+            LOG.error("Error in removeRrm", e);
+        } catch (OvsdbClientException | TimeoutException | InterruptedException e) {
             LOG.error("Error in removeRrm", e);
             throw new RuntimeException(e);
         }