Feature/scenario cleanup 1