[ci skip] Some more generic user guide cleanup