config refactoring, no setup wizard