Remove double locking