Remove some commented-out code.
Get rid of the kld lock macros.