diff --git a/ddclient.in b/ddclient.in
index 826fbcf..faecf6d 100755
--- a/ddclient.in
+++ b/ddclient.in
@@ -655,21 +655,6 @@ my %variables = (
         'static'              => setv(T_BOOL,  0, 1, 0,                    undef),
         'wildcard'            => setv(T_BOOL,  0, 1, 0,                    undef),
     },
-    'keysystems-common-defaults' => {
-        'server'              => setv(T_FQDNP, 1, 0, 'dynamicdns.key-systems.net', undef),
-        'login'               => setv(T_LOGIN, 0, 0, 0, 'unused',      undef),
-    },
-    'dnsexit2-common-defaults'       => {
-        'ssl'         => setv(T_BOOL,   0, 0, 1, undef),
-        'server'      => setv(T_FQDNP,  1, 0, 'api.dnsexit.com', undef),
-        'path'        => setv(T_STRING, 0, 0, '/dns/', undef),
-        'ttl'         => setv(T_NUMBER, 1, 0, 5, 0),
-        'zone'        => setv(T_STRING, 0, 0, undef, undef)
-    },
-    'regfishde-common-defaults' => {
-        'server'      => setv(T_FQDNP, 1, 0, 'dyndns.regfish.de', undef),
-        'login'       => setv(T_LOGIN, 0, 0, 0, 'unused', undef),
-    },
 );
 my %services = (
     '1984' => {
@@ -1052,7 +1037,8 @@ my %services = (
         'examples'  => \&nic_keysystems_examples,
         'variables' => {
             %{$variables{'service-common-defaults'}},
-            %{$variables{'keysystems-common-defaults'}},
+            'server' => setv(T_FQDNP, 1, 0, 'dynamicdns.key-systems.net', undef),
+            'login' => setv(T_LOGIN, 0, 0, 0, 'unused', undef),
         },
     },
     'dnsexit2' => {
@@ -1061,7 +1047,11 @@ my %services = (
         'examples'   => \&nic_dnsexit2_examples,
         'variables'  => {
             %{$variables{'service-common-defaults'}},
-            %{$variables{'dnsexit2-common-defaults'}},
+            'ssl' => setv(T_BOOL, 0, 0, 1, undef),
+            'server' => setv(T_FQDNP, 1, 0, 'api.dnsexit.com', undef),
+            'path' => setv(T_STRING, 0, 0, '/dns/', undef),
+            'ttl' => setv(T_NUMBER, 1, 0, 5, 0),
+            'zone' => setv(T_STRING, 0, 0, undef, undef),
             # nic_updateable() assumes that every service uses a username/login but that is
             # not true for the DNSExit API. Silence warnings by redefining the username variable
             # as non-required with value unused.
@@ -1074,7 +1064,8 @@ my %services = (
         'examples'   => \&nic_regfishde_examples,
         'variables' => {
             %{$variables{'service-common-defaults'}},
-            %{$variables{'regfishde-common-defaults'}},
+            'server' => setv(T_FQDNP, 1, 0, 'dyndns.regfish.de', undef),
+            'login' => setv(T_LOGIN, 0, 0, 0, 'unused', undef),
         },
     },
     'enom' => {