Refactored yml config files and removed unused settings variables (7571)