Doc clean-up