diff --git a/README.rst b/README.rst
index dc9ff56..7355835 100644
--- a/README.rst
+++ b/README.rst
@@ -237,4 +237,4 @@
 * https://gerrit-review.googlesource.com/Documentation/
 * https://github.com/openstack-infra/puppet-gerrit/
 * https://gerrit-ci.gerritforge.com/
-* https://github.com/morucci/exzuul
\ No newline at end of file
+* https://github.com/morucci/exzuul
diff --git a/_modules/gerrit.py b/_modules/gerrit.py
index 8db9e4a..8351192 100644
--- a/_modules/gerrit.py
+++ b/_modules/gerrit.py
@@ -201,10 +201,9 @@
                  account_id)
 
     import requests
-    from pygerrit import decode_response
+    from pygerrit.rest import _decode_response
 
     path = 'accounts/%s/sshkeys' % (account_id)
-    # gerrit.post(path, data=ssh_public_key)
 
     kwargs = {
         "data": ssh_public_key
@@ -213,7 +212,7 @@
 
     response = requests.put(gerrit.make_url(path), **kwargs)
 
-    return gerrit.decode_response(response)
+    return _decode_response(response)
 
 
 def _create_group_membership(gerrit, account_id, group_id):
diff --git a/gerrit/client/user.sls b/gerrit/client/user.sls
index 3b704c6..e8a2ad8 100644
--- a/gerrit/client/user.sls
+++ b/gerrit/client/user.sls
@@ -1,17 +1,6 @@
 {% from "gerrit/map.jinja" import client with context %}
 {%- if client.enabled %}
 
-{%- for group_name, group in client.group.iteritems() %}
-
-gerrit_client_group_{{ group_name }}:
-  gerrit.group_present:
-  - name: {{ group_name }}
-  {%- if group.description is defined %}
-  - description: {{ group.description }}
-  {%- endif %}
-
-{%- endfor %}
-
 {%- for account_name, account in client.user.iteritems() %}
 
 gerrit_client_account_{{ account_name }}: