more locking cleanups