More use statements
Merge pull request #1008 from ExchangeCore/config-cleanup

More use statements