More cleanup.
Sanitised version. Some settings are only accessible via manually editing the config file.