cleanup new configuration style