Further simplification of the scenario specific code