diff --git a/vmware_nsx/plugins/nsx_p/plugin.py b/vmware_nsx/plugins/nsx_p/plugin.py
index f7457f35da..a4e6419bc4 100644
--- a/vmware_nsx/plugins/nsx_p/plugin.py
+++ b/vmware_nsx/plugins/nsx_p/plugin.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import time
-
 import netaddr
 
 from oslo_config import cfg
@@ -2182,9 +2180,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
                         rule_id, e)
             # Go on with the deletion anyway
 
-        #TODO(annak): Due to platform bug, comm map may still be considered
-        # present for a short while. This is a workaround till issue is fixed.
-        time.sleep(2)
         self._delete_security_group_rule_backend_resources(
             context, domain_id, rule_db)
 
diff --git a/vmware_nsx/services/fwaas/nsx_p/fwaas_callbacks_v2.py b/vmware_nsx/services/fwaas/nsx_p/fwaas_callbacks_v2.py
index 6254d322b4..12717c341c 100644
--- a/vmware_nsx/services/fwaas/nsx_p/fwaas_callbacks_v2.py
+++ b/vmware_nsx/services/fwaas/nsx_p/fwaas_callbacks_v2.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import random
-import time
 
 import netaddr
 from oslo_log import log as logging
@@ -399,11 +398,6 @@ class NsxpFwaasCallbacksV2(com_callbacks.NsxCommonv3FwaasCallbacksV2):
         self.cleanup_router_fw_resources(domain_id, router_id)
 
     def cleanup_router_fw_resources(self, domain_id, router_id):
-        #TODO(asarfaty): Due to platform bug, gateway policy may still be
-        # considered present for a short while. This is a workaround till
-        # issue is fixed.
-        time.sleep(2)
-
         tags_to_search = [{'scope': ROUTER_FW_TAG, 'tag': router_id}]
         # Delete per rule & per network groups
         groups = self.nsxpolicy.search_by_tags(