Remove module support
Improve default configs load