removing obsolete/unsupported scenarios (cleaning)