cleanups after config refactoring