More docs cleanup

[Delivers #84148754]