fixed concurrency issues on removing entries