diff --git a/bothub/common/models.py b/bothub/common/models.py
index 35e974e0f..d24bb13e0 100644
--- a/bothub/common/models.py
+++ b/bothub/common/models.py
@@ -923,7 +923,6 @@ def get_migration_types(cls):
         return TYPES
 
     def current_entities(self, queryset=None, version_default=True):
-        version_default = version_default or True
         return self.entities.filter(
             value__in=self.repository.examples(
                 queryset=queryset, version_default=version_default
@@ -933,7 +932,7 @@ def current_entities(self, queryset=None, version_default=True):
             .distinct()
         )
 
-    def entities_list(self, queryset=None, version_default=None):  # pragma: no cover
+    def entities_list(self, queryset=None, version_default=True):  # pragma: no cover
         return (
             self.current_entities(queryset=queryset, version_default=version_default)
             .values_list("value", flat=True)
@@ -948,7 +947,7 @@ def current_groups(self):
     def groups_list(self):
         return self.current_groups.values_list("value", flat=True).distinct()
 
-    def other_entities(self, queryset=None, version_default=None):
+    def other_entities(self, queryset=None, version_default=True):
         return self.current_entities(
             queryset=queryset, version_default=version_default
         ).filter(group__isnull=True)
diff --git a/bothub/common/signals.py b/bothub/common/signals.py
index 729b39c0c..45b573e74 100644
--- a/bothub/common/signals.py
+++ b/bothub/common/signals.py
@@ -26,10 +26,11 @@ def handle_pre_delete(self, sender, instance, **kwargs):
             )
 
     def handle_delete(self, sender, instance, **kwargs):
-        app_label = instance._meta.app_label
-        model_name = instance._meta.model_name
-        model = instance._meta.concrete_model
-        if model in registry._models or model in registry._related_models:
-            celery_app.send_task(
-                "es_handle_delete", args=[instance.pk, app_label, model_name]
-            )
+        # app_label = instance._meta.app_label  // NOSONAR
+        # model_name = instance._meta.model_name  // NOSONAR
+        # model = instance._meta.concrete_model  // NOSONAR
+        # if model in registry._models or model in registry._related_models:  // NOSONAR
+        #     celery_app.send_task(  // NOSONAR
+        #         "es_handle_delete", args=[instance.pk, app_label, model_name]  // NOSONAR
+        #     )  // NOSONAR
+        pass