- Removed support for legacy settings
* A little cleanup