diff -Naur dhcp-with-radattr-support/server/db.c dhcp-4.3.2/server/db.c
--- dhcp-with-radattr-support/server/db.c	2015-05-26 10:27:03.604456797 +0200
+++ dhcp-4.3.2/server/db.c	2015-02-26 20:35:43.000000000 +0100
@@ -232,22 +232,12 @@
 	    struct option_cache *oc;
 	    struct data_string ds;
 	    pair p;
-	    char buffer[200];                         // r. innocente
 
 	    memset (&ds, 0, sizeof ds);
 	    for (p = lease -> agent_options -> first; p; p = p -> cdr) {
 	        oc = (struct option_cache *)p -> car;
 	        if (oc -> data.len) {
 	    	errno = 0;
-		int l;char *p;char *q;                // r. innocente
-		p = (char*)oc->data.data ;q = buffer; // r. innocente
-		*q = '"'; q++;                        // r. innocente
-		for(l=oc -> data.len;l;l--){          // r. innocente
-			*q = isprint(*p)?(*p):'.';    // r. innocente
-			p++;q++;                      // r. innocente
-		}                                     // r. innocente
-		*q = '"'; q++;                        // r. innocente
-		*q = '\0';	                      // r. innocente
 	    	fprintf (db_file, "\n  option agent.%s %s;",
 	    		 oc -> option -> name,
 	    		 pretty_print_option (oc -> option, oc -> data.data,
diff -Naur dhcp-with-radattr-support/server/omapi.c dhcp-4.3.2/server/omapi.c
--- dhcp-with-radattr-support/server/omapi.c	2015-05-26 10:31:45.575263594 +0200
+++ dhcp-4.3.2/server/omapi.c	2015-02-26 20:35:43.000000000 +0100
@@ -369,13 +369,6 @@
 				 ((omapi_object_t *)lease -> billing_class),
 				 MDL);
 		return ISC_R_NOTFOUND;
-	} else if (!omapi_ds_strcmp (name, "agent-options")) {   // r. innocente
-		if (lease -> agent_options)                      // r. innocente      
-			return omapi_make_handle_value           // r. innocente
-				(value, name,                    // r. innocente
-				 ((omapi_object_t *)lease -> agent_options), // r. innocente
-				 MDL);                           // r. innocente
-		return ISC_R_NOTFOUND;                           // r. innocente
 	} else if (!omapi_ds_strcmp (name, "hardware-address")) {
 		if (lease -> hardware_addr.hlen)
 			return omapi_make_const_value
@@ -595,26 +588,6 @@
 		if (status != ISC_R_SUCCESS)
 			return status;
 	}
-	if (lease -> agent_options) {                                 // r. innocente
-            struct option_cache *oc;                                  // r. innocente
-            struct data_string ds;                                    // r. innocente
-            char buffer[200];                                         // r. innocente
-            pair p;                                                   // r. innocente
-		// r. innocente
-            memset (&ds, 0, sizeof ds);		// r. innocente
-            for (p = lease -> agent_options -> first; p; p = p -> cdr) { // r. innocente
-                oc = (struct option_cache *)p -> car;		      // r. innocente
-                if (oc -> data.len) {		                      // r. innocente
-                sprintf (buffer,"agent.%s", oc -> option -> name);    // r. innocente
-                status = omapi_connection_put_name (c, buffer);	      // r. innocente
-                if (status != ISC_R_SUCCESS)		              // r. innocente
-                        return status;		                      // r. innocente
-               status = omapi_connection_put_string(c,(char*)oc -> data.data);	// r. innocente
-                if (status != ISC_R_SUCCESS)		              // r. innocente
-                        return status;		                      // r. innocente
-                }		                                      // r. innocente
-            }		                                              // r. innocente
-	}		// r. innocente
 
 	if (lease -> hardware_addr.hlen) {
 		status = omapi_connection_put_name (c, "hardware-address");
diff -Naur dhcp-with-radattr-support/server/stables.c dhcp-4.3.2/server/stables.c
--- dhcp-with-radattr-support/server/stables.c	2015-05-26 10:18:58.631146686 +0200
+++ dhcp-4.3.2/server/stables.c	2015-02-26 20:35:43.000000000 +0100
@@ -169,8 +169,6 @@
 	{ "agent-id", "I",			&agent_universe,   3, 1 },
 	{ "DOCSIS-device-class", "L",		&agent_universe,   4, 1 },
 	{ "link-selection", "I",		&agent_universe,   5, 1 },
-	{ "subscriber-id", "X",			&agent_universe,   6, 1 },
-	{ "radius-attributes", "X",		&agent_universe,   7, 1 },   // r. innocente
 	{ NULL, NULL, NULL, 0, 0 }
 };