Simplify Global Plus rules

List/domainset/cdn.conf

@@ -463,7 +463,6 @@ updates.signal.org
 updates2.signal.org
 
 # >> OCSP Stapling Server
-.pki.goog
 .lencr.org
 .ocsp.digicert.com
 .ocsp.comodoca.com

List/non_ip/global_plus.conf

@@ -23,9 +23,7 @@ DOMAIN-SUFFIX,fb.me
 DOMAIN-SUFFIX,fbcdn.net
 DOMAIN-SUFFIX,instagram.com
 DOMAIN-SUFFIX,messenger.com
-DOMAIN-SUFFIX,whatsapp.com
-DOMAIN-SUFFIX,whatsapp.net
-DOMAIN-SUFFIX,whatsapp.biz
+DOMAIN-KEYWORD,whatsapp
 DOMAIN-SUFFIX,oculus.com
 DOMAIN-SUFFIX,oculuscdn.com
 DOMAIN-KEYWORD,facebook
@@ -137,4 +135,4 @@ DOMAIN-SUFFIX,south-plus.net
 DOMAIN,ees.elsevier.com
 DOMAIN-KEYWORD,sci-hub
 
-# --- End of Enhanced Global Services Section ---
+# --- End of Enhanced Global Services Section ---