diff --git a/tasks/checks.yml b/tasks/checks.yml
index a78a0ef13890ff3206e8c8605285cdbef4bcd0e9..40ca0f2bf89e3551595930453a8fdf840457ae8e 100644
--- a/tasks/checks.yml
+++ b/tasks/checks.yml
@@ -24,13 +24,6 @@
           - ansible_distribution_release is regex("^stretch|buster|bullseye|bookworm|focal|bionic|jammy$")
         fail_msg: "The Linux distro {{ ansible_distribution }} {{ ansible_distribution_release }} is not supported by this role"
 
-    - name: Generate an array of existing PHP versions
-      set_fact:
-        php_versions_existing: "{{ ansible_local.phpquery | map(attribute='versions') }}"
-
-    - name: debug fail
-      fail:
-
     - name: Generate an array of existing PHP versions
       set_fact:
         php_versions_existing: "{{ php_versions_existing | default([]) }} + [ '{{ existing_version.key }}' ]"
@@ -76,8 +69,7 @@
 
         - name: Debug defined SAPIs for proposed PHP versions
           debug:
-            msg:
-              - "SAPI {{ php_versions[version].sapis }} is defined for PHP {{ version }}"
+            msg: "SAPI {{ php_versions[version].sapis }} is defined for PHP {{ version }}"
             verbosity: 3
           loop: "{{ php_versions_proposed }}"
           loop_control:
diff --git a/tasks/modules.yml b/tasks/modules.yml
index 13782a7086516a7d35c480deddddd14bc7668b06..28d9d25d6252f59564d121c7416a31dda03a61e2 100644
--- a/tasks/modules.yml
+++ b/tasks/modules.yml
@@ -4,18 +4,18 @@
 
     - name: "Debug the existing modules for SAPI {{ sapi.key }} for PHP version {{ version }}"
       debug:
-        var: ansible_local.phpquery.versions[version].sapis[sapi.key].modules
+        var: ansible_local.phpquery.versions[version].sapis[sapi.key].modules_enabled
         verbosity: 2
       when:
-        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules is defined
-        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules != []
+        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules_enabled is defined
+        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules_enabled != []
 
     - name: "Create an array for the existing modules for SAPI {{ sapi.key }} for PHP version {{ version }}"
       set_fact:
-        php_modules_existing: "{{ ansible_local.phpquery.versions[version].sapis[sapi.key].modules | sort }}"
+        php_modules_existing: "{{ ansible_local.phpquery.versions[version].sapis[sapi.key].modules_existing | sort }}"
       when:
-        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules is defined
-        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules != []
+        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules_existing is defined
+        - ansible_local.phpquery.versions[version].sapis[sapi.key].modules_existing != []
 
     - name: "Create an array for the proposed modules for SAPI {{ sapi.key }} for PHP version {{ version }}"
       set_fact:
diff --git a/tasks/version_checks.yml b/tasks/version_checks.yml
deleted file mode 100644
index 625b3f423ff60e4a816ddf4e99037839e22884a3..0000000000000000000000000000000000000000
--- a/tasks/version_checks.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: Check PHP version
-  block:
-
-    - name: "Debug local state for PHP version {{ ver.key }}"
-      debug:
-        msg:
-          - "installed_version.key {{ installed_version.key }}"
-          - "proposed_version.key {{ proposed_version.key }}"
-      # when: installed_version.key.state != proposed_version.key.state
-      loop: "{{ ansible_local.phpquery.versions | dict2items }}"
-      loop_control:
-        loop_var: installed_version
-        label: "{{ proposed_version.key }}"
-
-  tags:
-    - php
-...