diff --git a/tasks/main.yml b/tasks/main.yml
index c128a70..77a231a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,5 +15,4 @@
 - include: nodistro/modify-logo.yml
   when: zmlogologin is defined and zmlogoapp is defined
 - include: nodistro/policyd.yml
-  when: zmlogologin is defined and zmlogoapp is defined
   notify: reboot-machine
diff --git a/tasks/nodistro/install-spamassassin.yml b/tasks/nodistro/install-spamassassin.yml
index e7903e0..59969cd 100644
--- a/tasks/nodistro/install-spamassassin.yml
+++ b/tasks/nodistro/install-spamassassin.yml
@@ -32,17 +32,10 @@
 #
 # Registering Razor Install
 ###################################
-- name: Registering your Razor installation - User definitions
-  shell: 'razor-admin -home=/opt/zimbra/data/amavisd/.razor -register'
-  become: true
-  become_user: zimbra
-  when: rzuser is defined and rzpass is not defined
-
 - name: Registering your Razor installation - DEFAULT
   shell: 'razor-admin -home=/opt/zimbra/data/amavisd/.razor -register'
   become: true
   become_user: zimbra
-  when: rzuser is not defined and rzpass is not defined
 
 #
 # Configuring the Spamassassin
diff --git a/vars/main.yml b/vars/main.yml
index 1a88a84..d1ffd0e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -5,5 +5,3 @@ hostname: localhost
 domain: localdomain
 zmpasswd: 123change
 zmnetwork: 0.0.0.0/8
-zmlogologin:
-zmlogoapp: