Remove unnecessary locking