diff --git a/galera/init.sls b/galera/init.sls
deleted file mode 100644
index e683bd3..0000000
--- a/galera/init.sls
+++ /dev/null
@@ -1,28 +0,0 @@
-mariadb:
-  pkgrepo.managed:
-    - name: mariadb
-    - humanname: MariaDB
-    - baseurl: https://rpm.mariadb.org/10.6/rhel/$releasever/$basearch
-    - gpgkey: https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
-    - gpgcheck: 1
-
-galera:
-  pkg.installed:
-    - pkgs:
-      - MariaDB-server
-      - MariaDB-client
-      - galera-4
-    - require:
-      - pkgrepo: mariadb
-
-mariadb_service:
-  service.running:
-    - name: mariadb
-    - enable: true
-
-/root/.my.cnf:
-  file.managed:
-    - replace: false
-    - user: root
-    - group: root
-    - mode: 600
diff --git a/samba/files/wsdd.service b/samba/files/wsdd.service
index 3ecca31..9344e5c 100644
--- a/samba/files/wsdd.service
+++ b/samba/files/wsdd.service
@@ -4,7 +4,7 @@ Description=Web Services Dynamic Discovery host daemon
 After=network-online.target
 Wants=network-online.target
 ; It makes sense to have Samba running when wsdd starts, but is not required
-;Wants=smb.service
+Wants=smb.service
 
 [Service]
 Type=simple
diff --git a/top.sls b/top.sls
index a34f654..f2fc270 100644
--- a/top.sls
+++ b/top.sls
@@ -2,7 +2,7 @@
   '*':
     - common
     - users
-    - salt.minion
+    - salt
 {% if salt.pillar.get('restic', None) is not none %}
 #    - restic.client
 {% endif %}
@@ -15,10 +15,7 @@
     - resolv
   'vps47492.inmotionhosting.com':
     - gitea
-  'cent7-vm*.keiran.us':
-    - galera
   'kpi.keiran.us':
-    - salt.master
     - icinga2
     - nginx
 #    - restic.server
diff --git a/workstation/home.sls b/workstation/home.sls
deleted file mode 100644
index a267356..0000000
--- a/workstation/home.sls
+++ /dev/null
@@ -1,83 +0,0 @@
----
-{% import_yaml 'homexorg/packages.yaml' as packages %}
-
-{% if grains.lsb_distrib_id != 'Fedora' %}
-    {{ raise('stahp') }}
-{% endif %}
-
-home-installs:
-  pkg.installed:
-    - pkgs:
-{% for name in packages['install'] %}
-      - {{ name }}
-{% endfor %}
-
-home-removes:
-  pkg.removed:
-    - pkgs:
-{% for name in packages['remove'] %}
-      - {{ name }}
-{% endfor %}
-
-vlc:
-  pkg.installed:
-    - require:
-      - pkg: rpmfusion_free_release
-      # refresh mod_init ?
-
-# lutris
-
-google-chrome:
-  pkgrepo.managed:
-    - baseurl: http://dl.google.com/linux/chrome/rpm/stable/x86_64
-    - gpgcheck: true
-    - gpgkey: https://dl.google.com/linux/linux_signing_key.pub
-  pkg.installed:
-    - name: google-chrome-stable
-    - require:
-      - pkgrepo: google-chrome
-
-code:
-  pkgrepo.managed:
-    - humanname: Visual Studio Code
-    - baseurl: https://packages.microsoft.com/yumrepos/vscode
-    - gpgcheck: true
-    - gpgkey: https://packages.microsoft.com/keys/microsoft.asc
-  pkg.installed:
-    - require:
-      - pkgrepo: code
-
-keir_bin:
-  file.directory:
-    - name: /home/keiran/.local/bin
-    - user: keiran
-    - group: keiran
-
-telegram:
-  file.symlink:
-    - name: /home/keiran/.local/bin/Telegram
-    - target: /home/keiran/.local/lib/Telegram/Telegram
-    - require:
-    # FIXME
-      - file: keir_bin
-  archive.extracted:
-    - name: /home/keiran/.local/lib
-    - source: https://telegram.org/dl/desktop/linux
-    - archive_format: tar
-    - user: keiran
-    - group: keiran
-    - keep_source: false
-    - skip_verify: true
-    - if_missing: /home/keiran/.local/lib/Telegram/Telegram
-
-
-rpmfusion_free_release:
-  pkg.installed:
-    - sources:
-      - rpmfusion-free-release: https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ grains.osmajorrelease }}.noarch.rpm
-
-rpmfusion_nonfree_release:
-  pkg.installed:
-    - sources:
-      - rpmfusion-nonfree-release: https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ grains.osmajorrelease }}.noarch.rpm
-
diff --git a/workstation/init.sls b/workstation/init.sls
deleted file mode 100644
index a267356..0000000
--- a/workstation/init.sls
+++ /dev/null
@@ -1,83 +0,0 @@
----
-{% import_yaml 'homexorg/packages.yaml' as packages %}
-
-{% if grains.lsb_distrib_id != 'Fedora' %}
-    {{ raise('stahp') }}
-{% endif %}
-
-home-installs:
-  pkg.installed:
-    - pkgs:
-{% for name in packages['install'] %}
-      - {{ name }}
-{% endfor %}
-
-home-removes:
-  pkg.removed:
-    - pkgs:
-{% for name in packages['remove'] %}
-      - {{ name }}
-{% endfor %}
-
-vlc:
-  pkg.installed:
-    - require:
-      - pkg: rpmfusion_free_release
-      # refresh mod_init ?
-
-# lutris
-
-google-chrome:
-  pkgrepo.managed:
-    - baseurl: http://dl.google.com/linux/chrome/rpm/stable/x86_64
-    - gpgcheck: true
-    - gpgkey: https://dl.google.com/linux/linux_signing_key.pub
-  pkg.installed:
-    - name: google-chrome-stable
-    - require:
-      - pkgrepo: google-chrome
-
-code:
-  pkgrepo.managed:
-    - humanname: Visual Studio Code
-    - baseurl: https://packages.microsoft.com/yumrepos/vscode
-    - gpgcheck: true
-    - gpgkey: https://packages.microsoft.com/keys/microsoft.asc
-  pkg.installed:
-    - require:
-      - pkgrepo: code
-
-keir_bin:
-  file.directory:
-    - name: /home/keiran/.local/bin
-    - user: keiran
-    - group: keiran
-
-telegram:
-  file.symlink:
-    - name: /home/keiran/.local/bin/Telegram
-    - target: /home/keiran/.local/lib/Telegram/Telegram
-    - require:
-    # FIXME
-      - file: keir_bin
-  archive.extracted:
-    - name: /home/keiran/.local/lib
-    - source: https://telegram.org/dl/desktop/linux
-    - archive_format: tar
-    - user: keiran
-    - group: keiran
-    - keep_source: false
-    - skip_verify: true
-    - if_missing: /home/keiran/.local/lib/Telegram/Telegram
-
-
-rpmfusion_free_release:
-  pkg.installed:
-    - sources:
-      - rpmfusion-free-release: https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ grains.osmajorrelease }}.noarch.rpm
-
-rpmfusion_nonfree_release:
-  pkg.installed:
-    - sources:
-      - rpmfusion-nonfree-release: https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ grains.osmajorrelease }}.noarch.rpm
-
diff --git a/workstation/map.jinja b/workstation/map.jinja
deleted file mode 100644
index 493a074..0000000
--- a/workstation/map.jinja
+++ /dev/null
@@ -1,14 +0,0 @@
-install:
-  - gimp
-  - thunderbird
-  - terminator
-  - keepassxc
-  - gvfs-smb # https://wiki.archlinux.org/index.php/Thunar#Configuration
-  - discord
-remove:
-  - pidgin
-  - geany
-  - claws-mail
-  - parole
-  - pragha
-
diff --git a/workstation/vscode.sls b/workstation/vscode.sls
deleted file mode 100644
index b9bfd5d..0000000
--- a/workstation/vscode.sls
+++ /dev/null
@@ -1,26 +0,0 @@
----
-
-{% if grains.lsb_distrib_id != 'Fedora' %}
-    {{ raise('stahp') }}
-{% endif %}
-
-google-chrome:
-  pkgrepo.managed:
-    - baseurl: http://dl.google.com/linux/chrome/rpm/stable/x86_64
-    - gpgcheck: true
-    - gpgkey: https://dl.google.com/linux/linux_signing_key.pub
-  pkg.installed:
-    - name: google-chrome-stable
-    - require:
-      - pkgrepo: google-chrome
-
-code:
-  pkgrepo.managed:
-    - humanname: Visual Studio Code
-    - baseurl: https://packages.microsoft.com/yumrepos/vscode
-    - gpgcheck: true
-    - gpgkey: https://packages.microsoft.com/keys/microsoft.asc
-  pkg.installed:
-    - require:
-      - pkgrepo: code
-
diff --git a/workstation/work.sls b/workstation/work.sls
deleted file mode 100644
index e69de29..0000000