Clean up use of config namespace