diff --git a/gajim/common/modules/adhoc_commands.py b/gajim/common/modules/adhoc_commands.py
index ed19e5bc3..7afd97371 100644
--- a/gajim/common/modules/adhoc_commands.py
+++ b/gajim/common/modules/adhoc_commands.py
@@ -556,17 +556,14 @@ class AdHocCommands:
 
 class AdHocCommandError(NetworkIncomingEvent):
     name = 'adhoc-command-error'
-    base_network_events = []
 
 
 class AdHocCommandListReceived(NetworkIncomingEvent):
     name = 'adhoc-command-list'
-    base_network_events = []
 
 
 class AdHocCommandActionResponse(NetworkIncomingEvent):
     name = 'adhoc-command-action-response'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/blocking.py b/gajim/common/modules/blocking.py
index 39dd2d6b8..a6446be59 100644
--- a/gajim/common/modules/blocking.py
+++ b/gajim/common/modules/blocking.py
@@ -160,7 +160,6 @@ class Blocking:
 
 class BlockingEvent(NetworkIncomingEvent):
     name = 'blocking'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/bookmarks.py b/gajim/common/modules/bookmarks.py
index a9c68d7ae..a81df3596 100644
--- a/gajim/common/modules/bookmarks.py
+++ b/gajim/common/modules/bookmarks.py
@@ -320,7 +320,6 @@ class Bookmarks:
 
 class BookmarksReceivedEvent(NetworkIncomingEvent):
     name = 'bookmarks-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/entity_time.py b/gajim/common/modules/entity_time.py
index 0e5439d3d..40feca990 100644
--- a/gajim/common/modules/entity_time.py
+++ b/gajim/common/modules/entity_time.py
@@ -133,10 +133,6 @@ class EntityTime:
 
 class TimeResultReceivedEvent(NetworkIncomingEvent):
     name = 'time-result-received'
-    base_network_events = []
-
-    def generate(self):
-        return True
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/http_auth.py b/gajim/common/modules/http_auth.py
index 1060f69e8..da46643fa 100644
--- a/gajim/common/modules/http_auth.py
+++ b/gajim/common/modules/http_auth.py
@@ -74,7 +74,6 @@ class HTTPAuth:
 
 class HttpAuthReceivedEvent(NetworkIncomingEvent):
     name = 'http-auth-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/httpupload.py b/gajim/common/modules/httpupload.py
index 592cfd34a..f767c413c 100644
--- a/gajim/common/modules/httpupload.py
+++ b/gajim/common/modules/httpupload.py
@@ -421,7 +421,6 @@ class UploadAbortedException(Exception):
 
 class HTTPUploadProgressEvent(NetworkIncomingEvent):
     name = 'httpupload-progress'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/pep.py b/gajim/common/modules/pep.py
index 029824cb2..0ef071904 100644
--- a/gajim/common/modules/pep.py
+++ b/gajim/common/modules/pep.py
@@ -219,7 +219,6 @@ class AbstractPEPData:
 
 class PEPReceivedEvent(NetworkIncomingEvent):
     name = 'pep-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/ping.py b/gajim/common/modules/ping.py
index 5804c7444..d7a093ab4 100644
--- a/gajim/common/modules/ping.py
+++ b/gajim/common/modules/ping.py
@@ -109,17 +109,14 @@ class Ping:
 
 class PingSentEvent(NetworkIncomingEvent):
     name = 'ping-sent'
-    base_network_events = []
 
 
 class PingReplyEvent(NetworkIncomingEvent):
     name = 'ping-reply'
-    base_network_events = []
 
 
 class PingErrorEvent(NetworkIncomingEvent):
     name = 'ping-error'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/privacylists.py b/gajim/common/modules/privacylists.py
index 4bab95bdc..afcb66895 100644
--- a/gajim/common/modules/privacylists.py
+++ b/gajim/common/modules/privacylists.py
@@ -445,17 +445,14 @@ class PrivacyLists:
 
 class PrivacyListsReceivedEvent(NetworkIncomingEvent):
     name = 'privacy-lists-received'
-    base_network_events = []
 
 
 class PrivacyListReceivedEvent(NetworkIncomingEvent):
     name = 'privacy-list-received'
-    base_network_events = []
 
 
 class PrivacyListRemovedEvent(NetworkIncomingEvent):
     name = 'privacy-list-removed'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/pubsub.py b/gajim/common/modules/pubsub.py
index 3009c16a5..22a08a4d9 100644
--- a/gajim/common/modules/pubsub.py
+++ b/gajim/common/modules/pubsub.py
@@ -263,7 +263,6 @@ class PubSub:
 
 class PubSubConfigReceivedEvent(NetworkIncomingEvent):
     name = 'pubsub-config-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/roster_item_exchange.py b/gajim/common/modules/roster_item_exchange.py
index 9cb69fb4b..6a48216d0 100644
--- a/gajim/common/modules/roster_item_exchange.py
+++ b/gajim/common/modules/roster_item_exchange.py
@@ -120,7 +120,6 @@ class RosterItemExchange:
 
 class RosterItemExchangeEvent(NetworkIncomingEvent):
     name = 'roster-item-exchange-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/search.py b/gajim/common/modules/search.py
index 7d111d03c..a2c8f5d98 100644
--- a/gajim/common/modules/search.py
+++ b/gajim/common/modules/search.py
@@ -106,12 +106,10 @@ class Search:
 
 class SearchFormReceivedEvent(NetworkIncomingEvent):
     name = 'search-form-received'
-    base_network_events = []
 
 
 class SearchResultReceivedEvent(NetworkIncomingEvent):
     name = 'search-result-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/software_version.py b/gajim/common/modules/software_version.py
index 8eeabda03..434e4cd39 100644
--- a/gajim/common/modules/software_version.py
+++ b/gajim/common/modules/software_version.py
@@ -100,10 +100,6 @@ class SoftwareVersion:
 
 class VersionResultReceivedEvent(NetworkIncomingEvent):
     name = 'version-result-received'
-    base_network_events = []
-
-    def generate(self):
-        return True
 
 
 def get_instance(*args, **kwargs):
diff --git a/gajim/common/modules/vcard_temp.py b/gajim/common/modules/vcard_temp.py
index e985d128a..4c510d4e3 100644
--- a/gajim/common/modules/vcard_temp.py
+++ b/gajim/common/modules/vcard_temp.py
@@ -310,17 +310,14 @@ class VCardTemp:
 
 class VcardPublishedEvent(NetworkIncomingEvent):
     name = 'vcard-published'
-    base_network_events = []
 
 
 class VcardNotPublishedEvent(NetworkIncomingEvent):
     name = 'vcard-not-published'
-    base_network_events = []
 
 
 class VcardReceivedEvent(NetworkIncomingEvent):
     name = 'vcard-received'
-    base_network_events = []
 
 
 def get_instance(*args, **kwargs):