Add mutex to remove method