Cleaning up a bit

The plan is to drop this file entirely and move the logic off to the config
class itself which will be instantiated by the router.