diff --git a/collector/collector/api/common/util.py b/collector/collector/api/common/util.py
index 83ae938..e761be3 100644
--- a/collector/collector/api/common/util.py
+++ b/collector/collector/api/common/util.py
@@ -18,7 +18,6 @@ from flask import jsonify
 from functools import wraps
 import jsonschema
 import math
-import six
 from six.moves import xrange
 from sqlalchemy import and_
 from sqlalchemy import or_
@@ -185,7 +184,7 @@ def split_new_dicts_and_updated_objs(dicts, dict_to_obj_fields_mapping,
         if obj_idx in existed_objs_idx:
             # Updating existed object
             obj = existed_objs_idx[obj_idx]
-            for k, v in six.iteritems(d_copy):
+            for k, v in d_copy.items():
                 setattr(obj, k, v)
         else:
             new_dicts.append(d_copy)
diff --git a/collector/collector/api/config.py b/collector/collector/api/config.py
index fc78ee5..9cff3bb 100644
--- a/collector/collector/api/config.py
+++ b/collector/collector/api/config.py
@@ -15,8 +15,6 @@
 import logging
 import os
 
-import six
-
 
 class Production(object):
     DEBUG = False
@@ -127,7 +125,7 @@ def index_filtering_rules(app):
     if not filtering_rules:
         return
 
-    for release, rules in six.iteritems(filtering_rules):
+    for release, rules in filtering_rules.items():
         if not rules:
             continue
         filtering_rules[release] = convert_rules_to_dict(rules)
diff --git a/migration/manage_migration.py b/migration/manage_migration.py
index df6998d..a93cfa6 100755
--- a/migration/manage_migration.py
+++ b/migration/manage_migration.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import argparse
-import six
 import yaml
 
 from migration.test.test_env import configure_test_env
@@ -33,7 +32,7 @@ def handle_external_config(params):
 
             content = yaml.load(f)
             if isinstance(content, dict):
-                for k, v in six.iteritems(content):
+                for k, v in content.items():
                     setattr(config, k, v)