Remove some remnants of the old locking system.
Prep work for future calls to DNSSEC validation.
Misc. cleanups.