Docs and config var cleanup.