more cleanups, locking-related