CONFIG cleanup 1