SI-7633 Additional cleanup (man, docs, etc.)