some cleanups in configuration.h