Big cleanup in configuration

Signed-off-by: lsenta <laurent.senta@gmail.com>
More simplication

Signed-off-by: lsenta <laurent.senta@gmail.com>