documentation cleanup inspired by 23597