Remove redundant locking