Index: /trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp	(revision 79824)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp	(revision 79825)
@@ -1158,31 +1158,4 @@
     }
 
-
-#if 0 /* bird disabled this as it looks dubious and testing only. */
-    /** @todo XXX: testing ... */
-    if (vmopts != NULL)
-    {
-        for (optmap_t::const_iterator it = vmopts->begin(); it != vmopts->end(); ++it)
-        {
-            std::shared_ptr<DhcpOption> opt(it->second);
-            if (a_rRetOpts.count(opt->optcode()) == 0 && opt->optcode() > 127)
-            {
-                a_rRetOpts << opt;
-                LogRel2(("... forcing VM option %d (%#x)\n", opt->optcode(), opt->optcode()));
-            }
-        }
-    }
-
-    for (optmap_t::const_iterator it = m_GlobalOptions.begin(); it != m_GlobalOptions.end(); ++it)
-    {
-        std::shared_ptr<DhcpOption> opt(it->second);
-        if (a_rRetOpts.count(opt->optcode()) == 0 && opt->optcode() > 127)
-        {
-            a_rRetOpts << opt;
-            LogRel2(("... forcing global option %d (%#x)", opt->optcode(), opt->optcode()));
-        }
-    }
-#endif
-
     return a_rRetOpts;
 }
Index: /trunk/src/VBox/NetworkServices/Dhcpd/DHCPD.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/DHCPD.cpp	(revision 79824)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/DHCPD.cpp	(revision 79825)
@@ -332,7 +332,4 @@
     ack->addOptions(m_pConfig->getOptionsForClient(replyOptions, optlist, vecConfigs));
 
-    /** @todo r=bird: Sec 9.9 in rfc-2132 indicates the server only sends this in NACKs. Test code? */
-    ack->addOption(OptMessage("Ok, ok, here it is"));
-
     ack->maybeUnicast(req);
     return ack.release();