CUSTCONF-426 avoid locking - put deletes in the correct place
Merge pull request #41 from spikeybill/ZAT

CUSTCONF-426 avoid locking - put deletes in the correct place