Merge "Clean network scenarios"