diff --git a/inc/checkout/signup-fields/class-base-signup-field.php b/inc/checkout/signup-fields/class-base-signup-field.php
index 2071892a..460023f7 100644
--- a/inc/checkout/signup-fields/class-base-signup-field.php
+++ b/inc/checkout/signup-fields/class-base-signup-field.php
@@ -244,6 +244,9 @@ public function calculate_style_attr() {
 	/**
 	 * Sets the config values for the current field.
 	 *
+	 * Note: Return type intentionally omitted to preserve compatibility with
+	 * third-party subclasses that may not declare `: void`.
+	 *
 	 * @since 2.0.0
 	 *
 	 * @param array $attributes Array containing settings for the field.
diff --git a/inc/gateways/class-base-gateway.php b/inc/gateways/class-base-gateway.php
index 3b7e74c3..65cf58bb 100644
--- a/inc/gateways/class-base-gateway.php
+++ b/inc/gateways/class-base-gateway.php
@@ -596,6 +596,8 @@ public function supports_payment_polling() {
 	 */
 	public function verify_and_complete_payment($payment_id) {
 
+		unset($payment_id);
+
 		return [
 			'success' => false,
 			'status'  => 'pending',
diff --git a/inc/gateways/class-paypal-gateway.php b/inc/gateways/class-paypal-gateway.php
index 5d69fe06..8d2b92e9 100644
--- a/inc/gateways/class-paypal-gateway.php
+++ b/inc/gateways/class-paypal-gateway.php
@@ -1717,6 +1717,8 @@ public function get_checkout_details($token = '') {
 	 */
 	public function get_payment_url_on_gateway($gateway_payment_id) {
 
+		unset($gateway_payment_id);
+
 		return '';
 	}
 
diff --git a/inc/integrations/host-providers/class-cloudflare-host-provider.php b/inc/integrations/host-providers/class-cloudflare-host-provider.php
index d9813f07..3e373fd7 100644
--- a/inc/integrations/host-providers/class-cloudflare-host-provider.php
+++ b/inc/integrations/host-providers/class-cloudflare-host-provider.php
@@ -350,21 +350,35 @@ public function on_remove_subdomain($subdomain, $site_id) {
 				]
 			);
 
-			if ( ! $dns_entries->result) {
+			if (is_wp_error($dns_entries)) {
+				wu_log_add(
+					'integration-cloudflare',
+					sprintf(
+						'Failed to look up subdomain "%s" in Cloudflare. Reason: %s',
+						$original_subdomain,
+						$dns_entries->get_error_message()
+					),
+					LogLevel::ERROR
+				);
+
 				return;
 			}
 
+			if (empty($dns_entries->result)) {
+				continue;
+			}
+
 			$dns_entry_to_remove = $dns_entries->result[0];
 
 			$results = $this->cloudflare_api_call("client/v4/zones/$zone_id/dns_records/$dns_entry_to_remove->id", 'DELETE');
 
 			if (is_wp_error($results)) {
-				wu_log_add('integration-cloudflare', sprintf('Failed to remove subdomain "%s" to Cloudflare. Reason: %s', $subdomain, $results->get_error_message()), LogLevel::ERROR);
+				wu_log_add('integration-cloudflare', sprintf('Failed to remove subdomain "%s" from Cloudflare. Reason: %s', $original_subdomain, $results->get_error_message()), LogLevel::ERROR);
 
-				return;
+				continue;
 			}
 
-			wu_log_add('integration-cloudflare', sprintf('Removed sub-domain "%s" to Cloudflare.', $subdomain));
+			wu_log_add('integration-cloudflare', sprintf('Removed sub-domain "%s" from Cloudflare.', $original_subdomain));
 		}
 	}
 
diff --git a/inc/ui/class-account-summary-element.php b/inc/ui/class-account-summary-element.php
index 45a688ff..9ed6facb 100644
--- a/inc/ui/class-account-summary-element.php
+++ b/inc/ui/class-account-summary-element.php
@@ -216,7 +216,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->site = WP_Ultimo()->currents->get_site();
 
@@ -256,7 +256,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 
diff --git a/inc/ui/class-billing-info-element.php b/inc/ui/class-billing-info-element.php
index 30855726..1f8da7b7 100644
--- a/inc/ui/class-billing-info-element.php
+++ b/inc/ui/class-billing-info-element.php
@@ -102,7 +102,7 @@ public function init() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		add_wubox();
 	}
@@ -231,7 +231,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->membership = WP_Ultimo()->currents->get_membership();
 
@@ -248,7 +248,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 
diff --git a/inc/ui/class-checkout-element.php b/inc/ui/class-checkout-element.php
index 63e4bdf7..bb4e43fc 100644
--- a/inc/ui/class-checkout-element.php
+++ b/inc/ui/class-checkout-element.php
@@ -233,7 +233,7 @@ public function is_thank_you_page() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		if ($this->is_thank_you_page()) {
 			\WP_Ultimo\UI\Thank_You_Element::get_instance()->setup();
diff --git a/inc/ui/class-command-palette-manager.php b/inc/ui/class-command-palette-manager.php
index e32edab3..a1658132 100644
--- a/inc/ui/class-command-palette-manager.php
+++ b/inc/ui/class-command-palette-manager.php
@@ -37,7 +37,7 @@ class Command_Palette_Manager {
 	 * @since 2.1.0
 	 * @return void
 	 */
-	public function init() {
+	public function init(): void {
 
 		add_action('admin_enqueue_scripts', [$this, 'enqueue_scripts'], 100);
 
diff --git a/inc/ui/class-current-membership-element.php b/inc/ui/class-current-membership-element.php
index d3e5d616..ffd4352c 100644
--- a/inc/ui/class-current-membership-element.php
+++ b/inc/ui/class-current-membership-element.php
@@ -94,7 +94,7 @@ public function init() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		add_wubox();
 	}
@@ -259,7 +259,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->membership = WP_Ultimo()->currents->get_membership();
 
@@ -278,7 +278,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->membership = wu_mock_membership();
 
diff --git a/inc/ui/class-current-site-element.php b/inc/ui/class-current-site-element.php
index 4b2f8a76..155132a6 100644
--- a/inc/ui/class-current-site-element.php
+++ b/inc/ui/class-current-site-element.php
@@ -300,7 +300,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->site = WP_Ultimo()->currents->get_site();
 
@@ -319,7 +319,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 
@@ -332,7 +332,7 @@ public function setup_preview(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		add_wubox();
 	}
diff --git a/inc/ui/class-domain-mapping-element.php b/inc/ui/class-domain-mapping-element.php
index 75444f01..8bf15e0e 100644
--- a/inc/ui/class-domain-mapping-element.php
+++ b/inc/ui/class-domain-mapping-element.php
@@ -234,7 +234,7 @@ public function init() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		add_wubox();
 	}
@@ -1053,7 +1053,7 @@ public function handle_delete_dns_record(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->site = WP_Ultimo()->currents->get_site();
 
@@ -1075,7 +1075,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 
diff --git a/inc/ui/class-invoices-element.php b/inc/ui/class-invoices-element.php
index f04e228f..fa5ab282 100644
--- a/inc/ui/class-invoices-element.php
+++ b/inc/ui/class-invoices-element.php
@@ -202,7 +202,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_enqueue_script('wu-ajax-list-table');
 	}
@@ -235,7 +235,7 @@ public function dependencies(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->membership = WP_Ultimo()->currents->get_membership();
 
@@ -252,7 +252,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->membership = wu_mock_membership();
 	}
diff --git a/inc/ui/class-limits-element.php b/inc/ui/class-limits-element.php
index c0b110d8..308541ca 100644
--- a/inc/ui/class-limits-element.php
+++ b/inc/ui/class-limits-element.php
@@ -203,7 +203,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->site = WP_Ultimo()->currents->get_site();
 
@@ -218,7 +218,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 	}
diff --git a/inc/ui/class-login-form-element.php b/inc/ui/class-login-form-element.php
index 49411949..ba6a132e 100644
--- a/inc/ui/class-login-form-element.php
+++ b/inc/ui/class-login-form-element.php
@@ -298,7 +298,7 @@ public function fields() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_enqueue_style('wu-admin');
 
@@ -413,7 +413,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->logged = is_user_logged_in();
 
@@ -551,7 +551,7 @@ public function handle_redirect($redirect_to, $requested_redirect_to, $user) {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->logged = false;
 	}
diff --git a/inc/ui/class-magic-link-url-element.php b/inc/ui/class-magic-link-url-element.php
index ebbdf3af..4d32d627 100644
--- a/inc/ui/class-magic-link-url-element.php
+++ b/inc/ui/class-magic-link-url-element.php
@@ -196,7 +196,7 @@ public function fields(): array {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_enqueue_style('wu-admin');
 	}
@@ -262,7 +262,7 @@ public function defaults(): array {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 		// No setup restrictions - we render for both logged-in and anonymous users.
 		// Anonymous users get a regular link without the magic token.
 	}
@@ -273,7 +273,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site           = wu_mock_site();
 		$this->magic_link_url = home_url('?wu_magic_token=preview_token_example');
diff --git a/inc/ui/class-my-sites-element.php b/inc/ui/class-my-sites-element.php
index b0b3e8b9..f2759247 100644
--- a/inc/ui/class-my-sites-element.php
+++ b/inc/ui/class-my-sites-element.php
@@ -268,7 +268,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_enqueue_style('wu-admin');
 	}
@@ -279,7 +279,7 @@ public function register_scripts(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		global $wpdb;
 
@@ -298,7 +298,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->customer = wu_mock_customer();
 
diff --git a/inc/ui/class-payment-methods-element.php b/inc/ui/class-payment-methods-element.php
index 5884f5fa..651d0b38 100644
--- a/inc/ui/class-payment-methods-element.php
+++ b/inc/ui/class-payment-methods-element.php
@@ -154,7 +154,7 @@ public function defaults() {
 	 * @since 2.5.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->membership = WP_Ultimo()->currents->get_membership();
 		$this->customer   = WP_Ultimo()->currents->get_customer();
@@ -170,7 +170,7 @@ public function setup(): void {
 	 * @since 2.5.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->membership = wu_mock_membership();
 		$this->customer   = wu_mock_customer();
diff --git a/inc/ui/class-simple-text-element.php b/inc/ui/class-simple-text-element.php
index 52b8de00..13b3b5c4 100644
--- a/inc/ui/class-simple-text-element.php
+++ b/inc/ui/class-simple-text-element.php
@@ -147,7 +147,7 @@ public function fields() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_enqueue_style('wu-admin');
 	}
diff --git a/inc/ui/class-site-actions-element.php b/inc/ui/class-site-actions-element.php
index 540208a7..cb550d2c 100644
--- a/inc/ui/class-site-actions-element.php
+++ b/inc/ui/class-site-actions-element.php
@@ -71,7 +71,7 @@ class Site_Actions_Element extends Base_Element {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		add_wubox();
 	}
@@ -267,7 +267,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->site = WP_Ultimo()->currents->get_site();
 
@@ -290,7 +290,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 
diff --git a/inc/ui/class-site-maintenance-element.php b/inc/ui/class-site-maintenance-element.php
index d6d533a7..5795b7f0 100644
--- a/inc/ui/class-site-maintenance-element.php
+++ b/inc/ui/class-site-maintenance-element.php
@@ -207,7 +207,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$site = WP_Ultimo()->currents->get_site();
 
@@ -224,7 +224,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 	}
@@ -235,7 +235,7 @@ public function setup_preview(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_register_script('wu-site-maintenance', wu_get_asset('site-maintenance.js', 'js'), ['jquery', 'wu-functions'], wu_get_version(), true);
 		wp_register_style('wu-site-maintenance', wu_get_asset('site-maintenance.css', 'css'), [], wu_get_version());
diff --git a/inc/ui/class-template-previewer.php b/inc/ui/class-template-previewer.php
index a065e449..c5357d28 100644
--- a/inc/ui/class-template-previewer.php
+++ b/inc/ui/class-template-previewer.php
@@ -42,7 +42,7 @@ class Template_Previewer {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function init() {
+	public function init(): void {
 
 		add_action('plugins_loaded', [$this, 'hooks']);
 	}
@@ -159,7 +159,7 @@ public function send_cross_origin_headers(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		global $current_site;
 
diff --git a/inc/ui/class-template-switching-element.php b/inc/ui/class-template-switching-element.php
index 61b629eb..7864edb9 100644
--- a/inc/ui/class-template-switching-element.php
+++ b/inc/ui/class-template-switching-element.php
@@ -115,7 +115,7 @@ public function init() {
 	 *
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		wp_register_script('wu-template-switching', wu_get_asset('template-switching.js', 'js'), ['jquery', 'wu-vue-apps', 'wu-selectizer', 'wp-hooks', 'wu-cookie-helpers'], \WP_Ultimo::VERSION, true);
 
@@ -220,7 +220,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->site = wu_get_current_site();
 
@@ -254,7 +254,7 @@ public function setup(): void {
 	 *
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->site = wu_mock_site();
 	}
diff --git a/inc/ui/class-thank-you-element.php b/inc/ui/class-thank-you-element.php
index 0e73f0df..c130903b 100644
--- a/inc/ui/class-thank-you-element.php
+++ b/inc/ui/class-thank-you-element.php
@@ -117,7 +117,7 @@ public function maybe_replace_page_title($title, $id) {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		$has_pending_site = $this->membership ? (bool) $this->membership->get_pending_site() : false;
 		$is_publishing    = $has_pending_site ? $this->membership->get_pending_site()->is_publishing() : false;
@@ -313,7 +313,7 @@ public function defaults() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup(): void {
+	public function setup() {
 
 		$this->payment = wu_get_payment_by_hash(wu_request('payment'));
 
@@ -344,7 +344,7 @@ public function setup(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function setup_preview(): void {
+	public function setup_preview() {
 
 		$this->payment = wu_mock_payment();
 
diff --git a/inc/ui/class-tours.php b/inc/ui/class-tours.php
index 58b55c32..21edd224 100644
--- a/inc/ui/class-tours.php
+++ b/inc/ui/class-tours.php
@@ -74,7 +74,7 @@ public function mark_as_finished(): void {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function register_scripts(): void {
+	public function register_scripts() {
 
 		WP_Ultimo()->scripts->register_script_module('shepherd.js', wu_get_asset('lib/shepherd.js', 'js'));
 		WP_Ultimo()->scripts->register_style('shepherd', wu_get_asset('lib/shepherd.css', 'css'));