diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
deleted file mode 100644
index 97571d71..00000000
--- a/molecule/default/playbook.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Converge
-  hosts: all
-
-  # If testing in Docker cron won't be installed
-  pre_tasks:
-    - name: Install cron
-      become: true
-      ansible.builtin.dnf:
-        update_cache: true
-        name: cronie
-        state: present
diff --git a/molecule/ome-demoserver/molecule.yml b/molecule/ome-demoserver/molecule.yml
index ec612b45..a6f4041c 100644
--- a/molecule/ome-demoserver/molecule.yml
+++ b/molecule/ome-demoserver/molecule.yml
@@ -41,6 +41,8 @@ provisioner:
         omero_server_dbpassword: omero
         omero_server_mail_from: example.com
         omero_server_mail_host: localhost
+        omero_server_rootpassword: omero
+        omero_signup_email_body: 'Thank you for signing up.'
   lint:
     name: ansible-lint
 scenario:
diff --git a/omero/ome-demoserver.yml b/omero/ome-demoserver.yml
index 6b727b3f..a59bcc51 100644
--- a/omero/ome-demoserver.yml
+++ b/omero/ome-demoserver.yml
@@ -15,88 +15,7 @@
            ((ansible_virtualization_type is defined)
            and (ansible_virtualization_type == "VMware"))
 
-    # # Perhaps alter the role at
-    # # https://github.com/openmicroscopy/ansible-role-lvm-partition/
-    # # to make some of the variables non-required.
-    # - name: Resize root FS without altering mount options
-    #   tags: lvm
-    #   become: true
-    #   lvol:
-    #     lv: root
-    #     vg: VolGroup00
-    #     size: "{{ provision_root_lvsize }}"
-    #     shrink: false
-
-    # - name: Install Make Movie script Prerequisite | MEncoder - Repo
-    #   become: true
-    #   ansible.builtin.yum:
-    #     name: "http://li.nux.ro/download/nux/dextop/el7\
-    #       /x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm"
-    #     state: present
-
-    # - name: Install Make Movie script Prerequisite | MEncoder - Package
-    #   become: true
-    #   ansible.builtin.yum:
-    #     name: mencoder
-    #     state: present
-
-    # - name: Server-side script prerequisites
-    #   become: true
-    #   ansible.builtin.yum:
-    #     name: "{{ item }}"
-    #     state: present
-    #   with_items:
-    #     - mencoder # For the 'make movie' script
-
   roles:
-    # Now OME are using RHEL without Spacewalk, the current best-method of
-    # checking `is server deployed in Dundee/SLS` is
-    # checking for the SLS nameservers.
-    # - role: ome.system_monitor_agent
-    #   tags: monitoring
-    #   when: "'10.1.255.216' in ansible_dns.nameservers"
-
-    # Disk Layout - PostgreSQL | data dir on separate VG (SSD)
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: pgdata
-    #   lvm_vgname: "{{ provision_postgres_vgname }}"
-    #   lvm_lvmount: /var/lib/pgsql
-    #   lvm_lvsize: "{{ provision_postgres_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-    # # Disk Layout - OMERO | VG and LV (separate disk) for Binary Repository
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: datadir
-    #   lvm_vgname: "{{ provision_omero_server_datadir_vgname }}"
-    #   lvm_lvmount: "{{ omero_server_datadir }}"
-    #   lvm_lvsize: "{{ provision_omero_server_datadir_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-    # # Disk Layout - OMERO.server | LV for dist & logs
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: omero_server_basedir
-    #   lvm_vgname: VolGroup00
-    #   lvm_lvmount: "{{ omero_server_basedir }}"
-    #   lvm_lvsize: "{{ provision_omero_server_basedir_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-    # # Disk Layout - OMERO.web | LV for dist & logs
-    # - role: ome.lvm_partition
-    #   tags: lvm
-    #   lvm_lvname: omero_web_basedir
-    #   lvm_vgname: VolGroup00
-    #   lvm_lvmount: "{{ omero_web_basedir }}"
-    #   lvm_lvsize: "{{ provision_omero_web_basedir_lvsize }}"
-    #   lvm_lvfilesystem: "{{ filesystem }}"
-    #   lvm_shrink: false
-
-      # nginx_version: 1.16.1
 
     - role: ome.postgresql
       # no_log: true
@@ -260,51 +179,6 @@
         - restart omero-web
       no_log: true
 
-    # - name: Check_MK postgres plugin | check for plugin existence
-    #   tags: monitoring
-    #   ansible.builtin.stat:
-    #     path: "{{ check_mk_agent_plugin_path }}/mk_postgres"
-    #   register: check_mk_postgres_plugin_st
-
-    # - name: Check_MK postgres plugin | activate the plugin
-    #   tags: monitoring
-    #   become: true
-    #   command: >
-    #     cp "{{ check_mk_agent_plugin_path }}/mk_postgres"
-    #     /usr/share/check-mk-agent/plugins/
-    #     creates=/usr/share/check-mk-agent/plugins/mk_postgres
-    #   when: check_mk_postgres_plugin_st.stat.exists
-
-    # - name: Check_MK logwatch plugin | check for plugin existence
-    #   tags: monitoring
-    #   ansible.builtin.stat:
-    #     path: "{{ check_mk_agent_plugin_path }}/mk_logwatch"
-    #   register: check_mk_logwatch_plugin_st
-
-    # - name: Check_MK logwatch plugin | activate the plugin
-    #   tags: monitoring
-    #   become: true
-    #   command: >
-    #     cp "{{ check_mk_agent_plugin_path }}/mk_logwatch"
-    #     /usr/share/check-mk-agent/plugins/
-    #     creates=/usr/share/check-mk-agent/plugins/mk_logwatch
-    #   when: check_mk_logwatch_plugin_st.stat.exists
-
-    # - name: Check_MK logwatch plugin | check for default config file
-    #   tags: monitoring
-    #   ansible.builtin.stat:
-    #     path: "{{ check_mk_agent_config_example_path }}/logwatch.cfg"
-    #   register: check_mk_logwatch_plugin_conf_st
-
-    # - name: Check_MK logwatch plugin | copy the default config
-    #   tags: monitoring
-    #   become: true
-    #   command: >
-    #     cp "{{ check_mk_agent_config_example_path }}/logwatch.cfg"
-    #     "{{ check_mk_agent_config_path }}/logwatch.cfg"
-    #     creates="{{ check_mk_agent_config_path }}/logwatch.cfg"
-    #   when: check_mk_logwatch_plugin_conf_st.stat.exists
-
     - name: PostgreSQL Nightly Backups | Remove old cron job
       become: true
       ansible.builtin.file: