remove debug
configuration improvements