diff --git a/pdc_client/plugins/component.py b/pdc_client/plugins/component.py
index e368190..764dfad 100644
--- a/pdc_client/plugins/component.py
+++ b/pdc_client/plugins/component.py
@@ -62,17 +62,11 @@ def list_global_components(self, args):
         filters = extract_arguments(args, prefix='filter_')
         if not filters:
             self.subparsers.choices.get('list').error('At least some filter must be used.')
-        global_components = get_paged(self.client['global-components']._, **filters)
 
-        # TODO(xchu): this is temporary hack, should be removed after we drop the old contacts
-        global_components = list(global_components)
-        for global_component in global_components:
-            component_contacts = get_paged(self.client['global-component-contacts']._,
-                                           component=global_component['name'])
-            update_component_contacts(global_component, component_contacts)
+        global_components = get_paged(self.client['global-components']._, **filters)
 
         if args.json:
-            print json.dumps(global_components)
+            print json.dumps(list(global_components))
             return
 
         if global_components:
@@ -197,18 +191,11 @@ def list_release_components(self, args):
             self.subparsers.choices.get('list').error('At least some filter must be used.')
         if 'include_inactive_release' in args and args.include_inactive_release:
             filters['include_inactive_release'] = True
-        release_components = get_paged(self.client['release-components']._, **filters)
 
-        # TODO(xchu): this is temporary hack, should be removed after we drop the old contacts
-        release_components = list(release_components)
-        for release_component in release_components:
-            component_contacts = get_paged(self.client['release-component-contacts']._,
-                                           component=release_component['name'],
-                                           release=self._get_release_id(release_component))
-            update_component_contacts(release_component, component_contacts)
+        release_components = get_paged(self.client['release-components']._, **filters)
 
         if args.json:
-            print json.dumps(release_components)
+            print json.dumps(list(release_components))
             return
 
         if release_components:
diff --git a/tests/component/data/global_component/list.json b/tests/component/data/global_component/list.json
index ff89aeb..fa14cf3 100644
--- a/tests/component/data/global_component/list.json
+++ b/tests/component/data/global_component/list.json
@@ -1 +1,20 @@
-[{"name": "Test Global Component", "contacts": [], "labels": [{"url": "http://example.com/lable/1", "name": "test label", "description": "test label description"}], "dist_git_web_url": "http://pkgs.example.com/test_global_component", "upstream": {"homepage": "http://test_global_component.org", "scm_url": "http://test_global_component.org/git", "scm_type": "git"}, "dist_git_path": null, "id": "1"}]
+[
+    {
+        "dist_git_path": null,
+        "dist_git_web_url": "http://pkgs.example.com/test_global_component",
+        "id": "1",
+        "labels": [
+            {
+                "description": "test label description",
+                "name": "test label",
+                "url": "http://example.com/lable/1"
+            }
+        ],
+        "name": "Test Global Component",
+        "upstream": {
+            "homepage": "http://test_global_component.org",
+            "scm_type": "git",
+            "scm_url": "http://test_global_component.org/git"
+        }
+    }
+]
diff --git a/tests/component/data/global_component/list_with_contacts.json b/tests/component/data/global_component/list_with_contacts.json
new file mode 100644
index 0000000..2e14525
--- /dev/null
+++ b/tests/component/data/global_component/list_with_contacts.json
@@ -0,0 +1,31 @@
+[
+    {
+        "contacts": [
+            {
+                "contact": {
+                    "email": "maillist1@test.com",
+                    "id": 1,
+                    "mail_name": "maillist1"
+                },
+                "id": 1,
+                "role": "pm"
+            }
+        ],
+        "dist_git_path": null,
+        "dist_git_web_url": "http://pkgs.example.com/test_global_component",
+        "id": "1",
+        "labels": [
+            {
+                "description": "test label description",
+                "name": "test label",
+                "url": "http://example.com/lable/1"
+            }
+        ],
+        "name": "Test Global Component",
+        "upstream": {
+            "homepage": "http://test_global_component.org",
+            "scm_type": "git",
+            "scm_url": "http://test_global_component.org/git"
+        }
+    }
+]
diff --git a/tests/component/data/release_component/list.json b/tests/component/data/release_component/list.json
index 18e0d21..5964eb9 100644
--- a/tests/component/data/release_component/list.json
+++ b/tests/component/data/release_component/list.json
@@ -1 +1,18 @@
-[{"global_component": "test_global_component", "dist_git_web_url": "http://pkgs.example.com/test_release_component", "release": {"active": true, "release_id": "test_release"}, "active": true, "brew_package": null, "dist_git_branch": "test_branch", "id": "1", "name": "Test Release Component", "contacts": [], "bugzilla_component": null, "srpm": null, "type": "rpm"}]
+[
+    {
+        "active": true,
+        "brew_package": null,
+        "bugzilla_component": null,
+        "dist_git_branch": "test_branch",
+        "dist_git_web_url": "http://pkgs.example.com/test_release_component",
+        "global_component": "test_global_component",
+        "id": "1",
+        "name": "Test Release Component",
+        "release": {
+            "active": true,
+            "release_id": "test_release"
+        },
+        "srpm": null,
+        "type": "rpm"
+    }
+]
diff --git a/tests/component/data/release_component/list_with_contacts.json b/tests/component/data/release_component/list_with_contacts.json
new file mode 100644
index 0000000..2ff083f
--- /dev/null
+++ b/tests/component/data/release_component/list_with_contacts.json
@@ -0,0 +1,29 @@
+[
+    {
+        "active": true,
+        "brew_package": null,
+        "bugzilla_component": null,
+        "contacts": [
+            {
+                "contact": {
+                    "email": "maillist1@test.com",
+                    "id": 1,
+                    "mail_name": "maillist1"
+                },
+                "id": 1,
+                "role": "pm"
+            }
+        ],
+        "dist_git_branch": "test_branch",
+        "dist_git_web_url": "http://pkgs.example.com/test_release_component",
+        "global_component": "test_global_component",
+        "id": "1",
+        "name": "Test Release Component",
+        "release": {
+            "active": true,
+            "release_id": "test_release"
+        },
+        "srpm": null,
+        "type": "rpm"
+    }
+]
diff --git a/tests/component/tests.py b/tests/component/tests.py
index c3cb514..e14eb23 100644
--- a/tests/component/tests.py
+++ b/tests/component/tests.py
@@ -17,24 +17,6 @@ def setUp(self):
             'name': 'Test Global Component',
             'dist_git_path': None,
             'dist_git_web_url': 'http://pkgs.example.com/test_global_component',
-            'contacts': [
-                {
-                    'url': 'http://example.com/global-components/1/contacts/1/',
-                    'contact_role': 'test_role_a',
-                    'contact': {
-                        'mail_name': 'Test Maillist',
-                        'email': 'test_mail@example.com'
-                    }
-                },
-                {
-                    'url': 'http://example.com/global-components/1/contacts/2/',
-                    'contact_role': 'test_role_b',
-                    'contact': {
-                        'username': 'Test User',
-                        'email': 'test_user@example.com'
-                    }
-                }
-            ],
             'labels': [
                 {
                     'url': 'http://example.com/lable/1',
@@ -216,25 +198,7 @@ def setUp(self):
             'dist_git_web_url': 'http://pkgs.example.com/test_release_component',
             'active': True,
             'type': 'rpm',
-            'srpm': None,
-            'contacts': [
-                {
-                    'url': 'http://example.com/release-components/1/contacts/1/',
-                    'contact_role': 'test_role_a',
-                    'contact': {
-                        'mail_name': 'Test Maillist',
-                        'email': 'test_mail@example.com'
-                    }
-                },
-                {
-                    'url': 'http://example.com/release-components/1/contacts/2/',
-                    'contact_role': 'test_role_b',
-                    'contact': {
-                        'username': 'Test User',
-                        'email': 'test_user@example.com'
-                    }
-                }
-            ]
+            'srpm': None
         }
 
     def _setup_detail(self, api):
@@ -260,25 +224,7 @@ def _setup_list_filter(self, api):
                     'dist_git_web_url': 'http://pkgs.example.com/test_release_component',
                     'active': True,
                     'type': 'rpm',
-                    'srpm': None,
-                    'contacts': [
-                        {
-                            'url': 'http://example.com/release-components/1/contacts/1/',
-                            'contact_role': 'test_role_a',
-                            'contact': {
-                                'mail_name': 'Test Maillist',
-                                'email': 'test_mail@example.com'
-                            }
-                        },
-                        {
-                            'url': 'http://example.com/release-components/1/contacts/2/',
-                            'contact_role': 'test_role_b',
-                            'contact': {
-                                'username': 'Test User',
-                                'email': 'test_user@example.com'
-                            }
-                        }
-                    ]
+                    'srpm': None
                 }
             ]
         }