Doc clean-ups