388.06 More config cleanup