Improved config field dependencies
Bugfix: correctly handle [ NONE ] attribute setting
Bugfix: correctly handle [ NONE ] attribute setting
Remove commented out code that was replaced by expectations file