Removed support for config files
Refactor
Refactor