code simplification and switch to the new configuration approach