diff --git a/geonode/documents/views.py b/geonode/documents/views.py
index 3a257e7ca10..343528e6775 100644
--- a/geonode/documents/views.py
+++ b/geonode/documents/views.py
@@ -268,15 +268,6 @@ def form_valid(self, form):
             bbox = BBOXHelper.from_xy(bbox)
             self.object.bbox_polygon = bbox.as_polygon()
 
-        if getattr(settings, 'SLACK_ENABLED', False):
-            try:
-                from geonode.contrib.slack.utils import build_slack_message_document, send_slack_message
-                send_slack_message(
-                    build_slack_message_document(
-                        "document_new", self.object))
-            except Exception:
-                logger.error("Could not send slack message for new document.")
-
         self.object.save(notify=True)
         register_event(self.request, EventType.EVENT_UPLOAD, self.object)
 
diff --git a/geonode/maps/views.py b/geonode/maps/views.py
index f643b38f142..db6eb7cf4bb 100644
--- a/geonode/maps/views.py
+++ b/geonode/maps/views.py
@@ -471,21 +471,7 @@ def map_remove(request, mapid, template='maps/map_remove.html'):
             "map": map_obj
         })
     elif request.method == 'POST':
-        if getattr(settings, 'SLACK_ENABLED', False):
-            slack_message = None
-            try:
-                from geonode.contrib.slack.utils import build_slack_message_map
-                slack_message = build_slack_message_map("map_delete", map_obj)
-            except Exception:
-                logger.error("Could not build slack message for delete map.")
-            delete_map.apply_async((map_obj.id, ))
-            try:
-                from geonode.contrib.slack.utils import send_slack_messages
-                send_slack_messages(slack_message)
-            except Exception:
-                logger.error("Could not send slack message for delete map.")
-        else:
-            delete_map.apply_async((map_obj.id, ))
+        delete_map.apply_async((map_obj.id, ))
 
         register_event(request, EventType.EVENT_REMOVE, map_obj)
 
diff --git a/src/django-geonode-mapstore-client b/src/django-geonode-mapstore-client
new file mode 160000
index 00000000000..c5d68ed1c0e
--- /dev/null
+++ b/src/django-geonode-mapstore-client
@@ -0,0 +1 @@
+Subproject commit c5d68ed1c0ec387e6e3e4e355fc676fde6d7c480