diff --git a/smartgears/fhn_manager/tasks/main.yml b/smartgears/fhn_manager/tasks/main.yml
index 69013f69..96c8660a 100644
--- a/smartgears/fhn_manager/tasks/main.yml
+++ b/smartgears/fhn_manager/tasks/main.yml
@@ -1,21 +1,8 @@
 ---
-- block:
-    - name: Remove the old smart executor files if present
-      file: path={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }} state=absent
-
-  become: True
-  become_user: '{{ d4science_user }}'
-  when: ( not smart_executor_install ) or ( smartgears_upgrade ) 
-  tags: [ 'smartgears', 'fhn_manager', 'tomcat' ]
-
 - block: 
     - name: Remove the old fhn-manager files
       file: path={{ smartgears_instance_path }}/webapps/{{ fhn_manager_name }} state=absent
-
-  become: True
-  become_user: '{{ d4science_user }}'
-  when: ( remove_fhn_manager_install ) or ( smartgears_upgrade ) 
-  tags: [ 'smartgears', 'fhn_manager', 'tomcat' ]
+      when: fhn_manager_upgrade
   
 
 - block: