Additional cleanup for config.h