Update documentation
Fix use of legacy options; remove dead code