Some comment clean-up.