Remove requires for no-longer-used classes
Clearer and better organized config variables