Merge "Clean up scenario functions"