Docs cleanup

See commit msgs for details.