diff --git a/Manual.org b/Manual.org
index 6caab22..43c3934 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1469,7 +1469,6 @@ b'\xde\xad\xbe\xef'
   systemd:
     name: 'xlogin@{{ vdr.user }}.service'
     state: stopped
-    enabled: yes
 
 - name: Stop x
   systemd:
@@ -1611,7 +1610,6 @@ b'\xde\xad\xbe\xef'
     src: /usr/bin/start-desktop
     dest: /var/lib/vdr/plugins/desktop/starter
     state: link
-    force: false
   
 - name: enable and start xlogin for the vdr user
   systemd:
@@ -3157,7 +3155,7 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip
     - '"0070:4000" in pci'
     - '"4444:0016" in pci'
   notify: [ 'Restart VDR' ]
-
+#+END_SRC
 ** TODO autoinstall-dvbhddevice
 Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware sollte in yavdr-firmware stecken
 *** tasks
diff --git a/roles/autoinstall-hauppauge-pvr/tasks/main.yml b/roles/autoinstall-hauppauge-pvr/tasks/main.yml
index b6a2f64..95d6954 100644
--- a/roles/autoinstall-hauppauge-pvr/tasks/main.yml
+++ b/roles/autoinstall-hauppauge-pvr/tasks/main.yml
@@ -8,18 +8,3 @@
     - '"0070:4000" in pci'
     - '"4444:0016" in pci'
   notify: [ 'Restart VDR' ]
-
-** TODO autoinstall-dvbhddevice
-Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware sollte in yavdr-firmware stecken
-*** tasks
-#+BEGIN_SRC yaml :tangle roles/autoinstall-dvbhddevice/tasks/main.yml :padline no
----
-# file roles/autoinstall-dvbhddevice/tasks/main.yml
-
-- name: apt | install vdr-plugin-dvbhddevice if connected
-  apt:
-    name: vdr-plugin-dvbhddevice
-  when: 
-    - '"13c2:300a" in pci'
-    - '"13c2:300b" in pci'
-  notify: [ 'Restart VDR' ]
diff --git a/roles/yavdr-xorg/tasks/desktop-session.yml b/roles/yavdr-xorg/tasks/desktop-session.yml
index b5f5d29..cf897f8 100644
--- a/roles/yavdr-xorg/tasks/desktop-session.yml
+++ b/roles/yavdr-xorg/tasks/desktop-session.yml
@@ -90,7 +90,6 @@
     src: /usr/bin/start-desktop
     dest: /var/lib/vdr/plugins/desktop/starter
     state: link
-    force: false
   
 - name: enable and start xlogin for the vdr user
   systemd:
diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml
index 0e54e87..c3d3d45 100644
--- a/roles/yavdr-xorg/tasks/detect-xorg.yml
+++ b/roles/yavdr-xorg/tasks/detect-xorg.yml
@@ -23,7 +23,6 @@
   systemd:
     name: 'xlogin@{{ vdr.user }}.service'
     state: stopped
-    enabled: yes
 
 - name: Stop x
   systemd: