config.h cleanup