diff --git a/dnsconfig.js b/dnsconfig.js
index 78a19680d..91d9437f7 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -51,7 +51,6 @@ for (var subdomain in domains) {
             records.push(
                 CAA(
                     subdomainName,
-                    caaRecord.flags,
                     caaRecord.tag,
                     caaRecord.value
                 )
@@ -140,14 +139,6 @@ for (var subdomain in domains) {
     if (domainData.record.URL) {
         records.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON));
     }
-
-    // Handle Email Forwarding
-    if (domainData.email_forwarding) {
-        records.push(MX(subdomainName, 34, "route1.mx.cloudflare.net."));
-        records.push(MX(subdomainName, 62, "route2.mx.cloudflare.net."));
-        records.push(MX(subdomainName, 36, "route3.mx.cloudflare.net."));
-        records.push(TXT(subdomainName, "\"" + "v=spf1 include:_spf.mx.cloudflare.net ~all" + "\""));
-    }
 }
 
 var options = {