Clean configuration a bit