Cleanup for #169.  Verified all Scenarios are up to date.