More refactoring, removal of unnecessary config.