Remove unnecessary locking
Merge pull request #436 from WCPetersen/remove-extra-locking

Remove unnecessary locking