Issues with left over locks and failure to delete locks (possibly due to...

... async delete)