cleanup loading of the configfile and remove some includes