Further cleanups

* Fully qualified variables
* Removal of unsupported config options