Merge "remove scenarios"