Merge "delete obsolete scenario update code"