Coreconfig cleanup