diff --git a/lmn-client.yml b/lmn-client.yml
index c126b96..5584d6e 100644
--- a/lmn-client.yml
+++ b/lmn-client.yml
@@ -80,9 +80,6 @@
         loop_var: rolename
       when: custom_roles is defined
 
-
-#################
-
     - name: Final tasks
       ansible.builtin.include_role:
         name: "{{ role }}"
@@ -93,25 +90,6 @@
         - lmn_finish
         - lmn_tmpfixes
 
-#################
-
-- name: Apply additional laptop configuration
-  hosts: laptop
-  remote_user: ansible
-  become: true
-  vars_files: lmn-vault
-  tasks:
-    - name: Remove deprecated files and directories (laptop-class)
-      ansible.builtin.file:
-        path: "{{ item }}"
-        state: absent
-      with_items:
-        - /etc/systemd/network/80-wlan-dhcp.network
-        - /etc/systemd/network/wlan-dhcp.network
-        - /etc/systemd/network/virbr1.netdev
-        - /etc/systemd/network/virbr1.network
-        - /etc/systemd/network/wlan-dhcp.network
-        - /etc/NetworkManager/system-connections/FVS-devices.nmconnection
 
 - name: Apply roles that must run serial
   hosts: all
diff --git a/roles/lmn_security/handlers/main.yml b/roles/lmn_security/handlers/main.yml
index 2de8018..1a145ab 100644
--- a/roles/lmn_security/handlers/main.yml
+++ b/roles/lmn_security/handlers/main.yml
@@ -8,3 +8,4 @@
   ansible.builtin.systemd:
     name: polkit
     state: restarted
+  when: not run_in_installer|default(false)|bool