Removing clutter. Part of refactoring config.