usermanual : one more round of cleanups