Mutiple fixes

Remove support to default.settings
Improve code