Clean code after removal of config.h