even more cleanup of config.cpp