diff --git a/.gitignore b/.gitignore
index 9d05f70..0870b0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.log
 *.retry
 *.swp
+debug.yml
diff --git a/Makefile b/Makefile
index da54a61..54e99f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,3 @@
-clean:
-	apt autoremove --purge -y
-	apt clean -y
-
 install:
 	ansible-playbook -b -e user=wizawu -v install.yml
 
diff --git a/README.md b/README.md
index 26c7e15..58f1b7f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ echo > /etc/apt/sources.list
 
 # git clone this repository to /home/wizawu/.sysconf
 cd /home/wizawu/.sysconf
-make install clean
+make install
 ```
 
 ### Disable GUI
diff --git a/install.yml b/install.yml
index 8c01b96..f291324 100644
--- a/install.yml
+++ b/install.yml
@@ -135,6 +135,7 @@
     - include_tasks: tasks/vscode.yml
     - include_tasks: tasks/pip.yml
     - include_tasks: tasks/npm.yml
+    - include_tasks: tasks/cleanup.yml
 
     - name: create etc directories
       file: dest=/{{item}} state=directory recurse=yes
diff --git a/tasks/cleanup.yml b/tasks/cleanup.yml
new file mode 100644
index 0000000..a960fd2
--- /dev/null
+++ b/tasks/cleanup.yml
@@ -0,0 +1,36 @@
+- name: disable services
+  service:
+    name: "{{item}}"
+    state: stopped
+    enabled: false
+  ignore_errors: true
+  with_items:
+    - snapd.seeded
+    - snapd.socket
+    - snapd
+
+- name: uninstall packages
+  apt:
+    state: absent
+    name:
+      - cloud-init
+      - pcp
+      - xdg-desktop-portal-gtk
+      - xdg-desktop-portal-wlr
+
+- name: apt clean
+  apt:
+    autoremove: true
+    purge: true
+    clean: true
+
+- name: remove cinnamon-screensaver, nemo-desktop
+  shell: mv /usr/bin/{{item}} /usr/bin/.{{item}}
+  ignore_errors: true
+  with_items:
+    - cinnamon-screensaver
+    - csd-clipboard
+    - csd-keyboard
+    - csd-media-keys
+    - csd-screensaver-proxy
+    - nemo-desktop
diff --git a/tasks/command.yml b/tasks/command.yml
index d867bfd..c9b0436 100644
--- a/tasks/command.yml
+++ b/tasks/command.yml
@@ -2,6 +2,7 @@
   apt:
     name:
       - ack-grep
+      - aha
       - apt-file
       - autossh
       - chrony
@@ -13,6 +14,7 @@
       - dconf-cli
       - di
       - docker-ce
+      - fdisk
       - fish
       - fping
       - git-extras
diff --git a/tasks/desktop.yml b/tasks/desktop.yml
index 19fa873..502f645 100644
--- a/tasks/desktop.yml
+++ b/tasks/desktop.yml
@@ -63,15 +63,3 @@
       - cinnamon-session
       - nautilus
       - network-manager-gnome
-
-- name: uninstall packages
-  apt:
-    state: absent
-    name:
-      - xdg-desktop-portal-gtk
-      - xdg-desktop-portal-wlr
-
-- name: remove cinnamon-screensaver, nemo-desktop
-  shell: |
-    mv /usr/bin/cinnamon-screensaver /usr/bin/.cinnamon-screensaver
-    mv /usr/bin/nemo-desktop /usr/bin/.nemo-desktop