enhance and cleanup system config data