WIP: Beta usable: We clean a bit the configuration