CAL-250 remove old config, add some descriptions and comments