locking; remove some lost comments.