diff --git a/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
@@ -59,7 +59,7 @@ from rhodecode.lib.vcs.backends.base imp
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
@@ -2830,7 +2830,7 @@ class RepoGroup(Base, BaseModel):
         from rhodecode.lib.vcs.utils.helpers import parse_datetime
 
         def repo_groups_and_repos():
-            all_entries = OrderedDefaultDict(list)
+            all_entries = []
 
             def _get_members(root_gr, pos=0):
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
@@ -59,7 +59,7 @@ from rhodecode.lib.vcs.backends.base imp
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
@@ -59,7 +59,7 @@ from rhodecode.lib.vcs.backends.base imp
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
--- a/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
@@ -59,7 +59,7 @@ from rhodecode.lib.vcs.backends.base imp
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py
--- a/rhodecode/lib/utils2.py
+++ b/rhodecode/lib/utils2.py
@@ -780,13 +780,6 @@ class AttributeDict(AttributeDictBase):
         return self.get(attr, None)
 
 
-class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict):
-    def __init__(self, default_factory=None, *args, **kwargs):
-        # in python3 you can omit the args to super
-        super(OrderedDefaultDict, self).__init__(*args, **kwargs)
-        self.default_factory = default_factory
-
-
 def fix_PATH(os_=None):
     """
     Get current active python path, and append it to PATH variable to fix
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -60,7 +60,7 @@ from rhodecode.lib.vcs.backends.base imp
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json