diff --git a/modules/gerrit/manifests/cron.pp b/modules/gerrit/manifests/cron.pp
index 07c6103541..697597c0e3 100644
--- a/modules/gerrit/manifests/cron.pp
+++ b/modules/gerrit/manifests/cron.pp
@@ -1,17 +1,6 @@
 # == Class: gerrit::cron
 #
-class gerrit::cron(
-  $script_user = 'update',
-  $script_key_file = '/home/gerrit2/.ssh/id_rsa'
-) {
-
-  cron { 'expireoldreviews':
-    user    => 'gerrit2',
-    hour    => '6',
-    minute  => '3',
-    command => "python /usr/local/bin/expire-old-reviews ${script_user} ${script_key_file}",
-    require => Class['jeepyb'],
-  }
+class gerrit::cron {
 
   cron { 'gerrit_repack':
     user        => 'gerrit2',
@@ -22,6 +11,11 @@ class gerrit::cron(
     environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
   }
 
+  cron { 'expireoldreviews':
+    ensure      => 'absent',
+    user        => 'gerrit2',
+  }
+
   cron { 'removedbdumps':
     ensure      => 'absent',
     user        => 'gerrit2',
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index b4ae772d93..9cee29dced 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -43,9 +43,6 @@ class openstack_project::gerrit (
   $contactstore_appsec = '',
   $contactstore_pubkey = '',
   $contactstore_url = '',
-  $script_user = 'update',
-  $script_key_file = '/home/gerrit2/.ssh/id_rsa',
-  $script_logging_conf = '/home/gerrit2/.sync_logging.conf',
   $projects_file = 'UNDEF',
   $projects_config = 'UNDEF',
   $github_username = '',
@@ -200,10 +197,7 @@ class openstack_project::gerrit (
   }
 
   if ($testmode == false) {
-    class { 'gerrit::cron':
-      script_user     => $script_user,
-      script_key_file => $script_key_file,
-    }
+    include gerrit::cron
     class { 'github':
       username         => $github_username,
       project_username => $github_project_username,
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 33ad12d548..6cd7ad2a41 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -114,9 +114,6 @@ class openstack_project::review (
     contactstore_pubkey                 => $contactstore_pubkey,
     contactstore_url                    =>
       'http://www.openstack.org/verify/member/',
-    script_user                         => 'launchpadsync',
-    script_key_file                     => '/home/gerrit2/.ssh/launchpadsync_rsa',
-    script_logging_conf                 => '/home/gerrit2/.sync_logging.conf',
     projects_file                       =>
       'puppet:///modules/openstack_project/review.projects.yaml',
     projects_config                     =>
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 290473c2c0..d5fb535218 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -48,9 +48,6 @@ class openstack_project::review_dev (
     contactstore_pubkey             => $contactstore_pubkey,
     contactstore_url                =>
       'https://review-dev.openstack.org/fakestore',
-    script_user                     => 'launchpadsync',
-    script_key_file                 => '/home/gerrit2/.ssh/launchpadsync_rsa',
-    script_logging_conf             => '/home/gerrit2/.sync_logging.conf',
     projects_file                   =>
       'puppet:///modules/openstack_project/review-dev.projects.yaml',
     projects_config                 =>