FreeBSD: How to turn off debug options in CURRENT

I searched for info on how to turn off debugging in FreeBSD CURRENT or in my case FREEBSD_6, the soon to be FREEBSD_6_0_RELEASE, which still has debugging on.
After some reading this is what needs to be done:

- kernel options that need to be commented:

#options        KDB
#options        DDB
#options        GDB
#options        INVARIANTS
#options        INVARIANT_SUPPORT
#options        WITNESS
#options        WITNESS_SKIPSPIN

If you're using a uniprocessor system, recompile the kernel without
"options SMP" and possibly without "device apic"

- To completely disable the default malloc debugging options do:

ln -s 'aj' /etc/malloc.conf


Well, after this is rebuilding world and kernel :)