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