Add a lock assertion.  Remove dead (locking) code.  Change some white space.
Add a lock assertion.  Remove dead (locking) code.  Change some white
space.

Reviewed by: cognet@

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase