diff --git a/evennia/players/players.py b/evennia/players/players.py
index 63e840edc7..913bebf058 100644
--- a/evennia/players/players.py
+++ b/evennia/players/players.py
@@ -863,8 +863,8 @@ class DefaultGuest(DefaultPlayer):
         """
         super(DefaultGuest, self).at_disconnect()
         characters = self.db._playable_characters
-        for character in filter(None, characters):
-            character.delete()
+        for character in characters:
+            if character: character.delete()
 
     def at_server_shutdown(self):
         """
@@ -873,8 +873,8 @@ class DefaultGuest(DefaultPlayer):
         """
         super(DefaultGuest, self).at_server_shutdown()
         characters = self.db._playable_characters
-        for character in filter(None, characters):
-            character.delete()
+        for character in characters:
+            if character: character.delete()
 
     def at_post_disconnect(self):
         """
diff --git a/evennia/server/server.py b/evennia/server/server.py
index b3d09944ee..717cbe0440 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -439,8 +439,8 @@ class Evennia(object):
 
         if GUEST_ENABLED:
             for guest in PlayerDB.objects.all().filter(db_typeclass_path=settings.BASE_GUEST_TYPECLASS):
-                for character in filter(None, guest.db._playable_characters):
-                    character.delete()
+                for character in guest.db._playable_characters:
+                    if character: character.delete()
                 guest.delete()
         if SERVER_STARTSTOP_MODULE:
             SERVER_STARTSTOP_MODULE.at_server_cold_start()
diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py
index 62f96c6b99..818a5f6351 100644
--- a/evennia/utils/evtable.py
+++ b/evennia/utils/evtable.py
@@ -189,8 +189,7 @@ class ANSITextWrapper(TextWrapper):
         else:
             pat = self.wordsep_simple_re_uni
         chunks = pat.split(_to_ansi(text))
-        chunks = filter(None, chunks)  # remove empty chunks
-        return chunks
+        return [chunk for chunk in chunks if chunk]  # remove empty chunks
 
     def _wrap_chunks(self, chunks):
         """_wrap_chunks(chunks : [string]) -> [string]