diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml
index aae14fa9..be1b420f 100644
--- a/roles/shell/tasks/users.yml
+++ b/roles/shell/tasks/users.yml
@@ -43,14 +43,12 @@
 - include: users/cyber.yml
 - include: users/cyphyx.yml
 - include: users/d34d.yml
-#- include: users/dalist.yml
 #- include: users/danielscode.yml
 - include: users/dariusz.yml
 #- include: users/delta.yml
 #- include: users/derby.yml
 - include: users/dex.yml
 - include: users/diabla.yml
-#- include: users/dingb4t.yml
 #- include: users/dot.yml
 - include: users/dovahkin.yml
 #- include: users/dragon.yml
@@ -73,8 +71,6 @@
 #- include: users/hexhaxtron.yml
 #- include: users/hijaben.yml
 - include: users/hitomi.yml
-#- include: users/info.yml
-#- include: users/infoTV.yml
 #- include: users/init0.yml
 #- include: users/isaac.yml
 - include: users/jac98.yml
@@ -113,7 +109,6 @@
 - include: users/neo.yml
 - include: users/noce.yml
 - include: users/olya.yml
-#- include: users/orliesaurus.yml
 #- include: users/os.yml
 #- include: users/panzer.yml
 #- include: users/parik.yml
@@ -144,10 +139,8 @@
 - include: users/southerntofu.yml
 #- include: users/spanmer.yml
 #- include: users/stenli990801.yml
-#- include: users/stereo.yml
 - include: users/swann.yml
 #- include: users/syncore.yml
-#- include: users/techemporium.yml
 - include: users/thekingofbandit.yml
 #- include: users/tomjerr.yml
 - include: users/transfusion.yml
diff --git a/roles/shell/tasks/users/dalist.yml b/roles/shell/tasks/users/dalist.yml
deleted file mode 100644
index d179580d..00000000
--- a/roles/shell/tasks/users/dalist.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Setting up dalist
-  user:
-    name: dalist
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/dalist
-- authorized_key:
-    user: dalist
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJV8lNQTsNyg05rNN65QTnNtqMgBw0CSX0bO+5x7nGw4THWGU0nQkfiQtg1ra5HF+RIQyTOdlITBOhbQkkR5RQ/DVzKdiXnYRHU6dGn1/kRCeAHGnqh4ge+scuUSTOM6dLf6SgeMP9RywoT7BFZj/r0wfgq/IChKmnxG8wcmqHQzHtMLTkcYFSqQG4yDdQaEc37V/r7QhPAEdxLfRaOIWSgJ/QEzMEguSYpRkc0SguWitXuRGiI+SMo9BAeDWycYyqgJlDbTvB1RIMchYP2r5c8+5TtEm/saDmg8gRVDeVtTA0LCPTCWcjDHACOWBam298Eook+bMkyyAO+sBxoWkp"
\ No newline at end of file
diff --git a/roles/shell/tasks/users/dingb4t.yml b/roles/shell/tasks/users/dingb4t.yml
deleted file mode 100644
index 8f373623..00000000
--- a/roles/shell/tasks/users/dingb4t.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Setting up dingb4t
-  user:
-    name: dingb4t
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/dingb4t
-- authorized_key:
-    user: dingb4t
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEApqUKQuXz+RrPqtdX0fYT8JcC3ioxLh8F9Tio2/XD+3kIG27jdR8X/SAhKSCqHVfhzLZDFEW2F2cGc3K3UV9hPfQmGzkbq354yUFZnIqmcrFFMvSxl9og6NfZohYk34JCEQ4WLxVmF1p0NSFSsNmTOw8gDxqehMF61mRRM247xiJTIvwB8ACPzzBbPg6U86YGzh5zEMrC4R+LK09ag+l26a9h+y/gzllfLeZc2E3ZU6P9+tc/qr7iWYJAFUvvi9G0Qm+k6kuJ5rzXIwh3pqfISudyMjB4r5w5u1f8U99iUc54OTPv0UdT+ojPFWzTmu3iGj1vF8zITHgvwoHaO26GZQ==" 
diff --git a/roles/shell/tasks/users/info.yml b/roles/shell/tasks/users/info.yml
deleted file mode 100644
index 73fe934c..00000000
--- a/roles/shell/tasks/users/info.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Setting up info
-  user:
-    name: info
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/info
-
-- authorized_key:
-    user: info
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCMK4H6kDNDqkda/JkeEVcQcU1sn/zAh8W6KnP/EyZ2hUqvqiCG8f441DCE9dJCq7ZB/xM4TLAFr/UVfdqoGdyiAf5LtBwGydz1AJqF7PRVvYnE8knO1p8HH5nx1jSYFHIXoS3grvVSbyUzJkYR1V22xjxjyhpOjjAXwHAhYQHVpbspVQHCE3gHNU1zvYwAP1pBqWGtTGKMATtMz6ECcl3d4jhCrkq2wVoTOWDSzBvfOOmxW3WnI/AD9q2W71tEeymVBkgJ/2jfrVa3mKP4/ng9jsva/Tes4gxwFduZMxcXt2Hpf+v3dC/rlqYPKGRkf1N+UmnlCpmGuMDpTWUJix9f thunixshell"
diff --git a/roles/shell/tasks/users/infoTV.yml b/roles/shell/tasks/users/infoTV.yml
deleted file mode 100644
index 23236b31..00000000
--- a/roles/shell/tasks/users/infoTV.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Setting up info
-  user:
-    name: infoTV
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/infoTV
-
-- authorized_key:
-    user: infoTV
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCMK4H6kDNDqkda/JkeEVcQcU1sn/zAh8W6KnP/EyZ2hUqvqiCG8f441DCE9dJCq7ZB/xM4TLAFr/UVfdqoGdyiAf5LtBwGydz1AJqF7PRVvYnE8knO1p8HH5nx1jSYFHIXoS3grvVSbyUzJkYR1V22xjxjyhpOjjAXwHAhYQHVpbspVQHCE3gHNU1zvYwAP1pBqWGtTGKMATtMz6ECcl3d4jhCrkq2wVoTOWDSzBvfOOmxW3WnI/AD9q2W71tEeymVBkgJ/2jfrVa3mKP4/ng9jsva/Tes4gxwFduZMxcXt2Hpf+v3dC/rlqYPKGRkf1N+UmnlCpmGuMDpTWUJix9f thunixshell"
diff --git a/roles/shell/tasks/users/orliesaurus.yml b/roles/shell/tasks/users/orliesaurus.yml
deleted file mode 100644
index 5146c967..00000000
--- a/roles/shell/tasks/users/orliesaurus.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Setting up orliesaurus
-  user:
-    name: orliesaurus
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/orliesaurus
-- authorized_key:
-    user: orliesaurus
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAo4kRIK2l8i0Jb7NsWkETg+xP2on/HZCA8O1JhbIYYcuwWEJg+MZ5HyQzm/pt7uXCrIKJOGi2HvZ88ZOhs59IzQ2js3inVrbL910dcdvIvsJiyh6VbjWnpS5QP320VYkBL4cqC6bcpdKfHB5X7fZM00+5a/i61Xez2tXsd6SgQ1kWg5K1crrPDf+B2Ebc+Z71hFfSfeYeoD9ccerW10XGKu36KO8oLw1+gb8rOLpPHvb/+Pcct9+ZqS4ZzdkdIkdxMxG+zgwX2f1ZrYeWoXYR2fEKm/9KuGO1dg/X2VHrS7+OhOC3eoXWsPDWNNS1lKasOykJTp+G1P2VIQOHD9CDwQ=="
diff --git a/roles/shell/tasks/users/stereo.yml b/roles/shell/tasks/users/stereo.yml
deleted file mode 100644
index d4a178c4..00000000
--- a/roles/shell/tasks/users/stereo.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Setting up stereo
-  user:
-    name: stereo
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/stereo
-- authorized_key:
-    user: stereo
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAg6iSwvtUxZ566PY/WiROmXbosiaKrwmmYLgFTKTF9fU9QU7qzi4AIKPqgIn0tXskmgs0vdweCzLOZ3S+iQSpV55n2fLMd695p7+i/RSVHojCxYDtQ0eMzEC9/fDlFJ3+cVzQu2vnNvT5pxZ3t7CET0UhZclaOvmsU7rSUrS0jGo6Dh3RC2zaXT+/Agxi3+mtraCPSLvfrzfmgN2urTHQTeD8O9FwRbStRJx0xar5RlAH41k0nCvZMkucKmCpfzsQB9yVEdxl9tWULHYYkW5zVdVIvtq2DT3hg8cPquXR2nqWRVlrEHm9thxoT2RWQ3eHqk3l9j/jths6nqn9tv2dUw=="
diff --git a/roles/shell/tasks/users/techemporium.yml b/roles/shell/tasks/users/techemporium.yml
deleted file mode 100644
index e93675ba..00000000
--- a/roles/shell/tasks/users/techemporium.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Setting up techemporium
-  user:
-    name: techemporium
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/techemporium
-- authorized_key:
-    user: techemporium
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQBmQYhcyYJ/YqVsmoqEnyGwiftKgrsnC5oPy0YuLBVg/3t9ps3HG4SBOSqsMn+W6pRGyvXKOoBAH6Dq59OBw7gTiFaVylzx2+ADPpPleTxyyBWAB9qksh/dv0ovu3APvSQMkWvuibmEAW294WpCd5Gk5rZJ5RIyfaGLgRS5ue50+nUgruIOz2SPSeGuNw9O3Brg+33bRM5Bv9MysI5p1rjip13tHcIOBPoPO/R2APew3a6YG6L+95D5HO0DW3A/4snKzrLDTtCDR7NsdOOIYqqsBiQIkgaNvPnP0f5iVZCJm8qw9+eM8u/EK0k8F/GQ8FDht7IrnN9Q6n3D9kVrWLa/"