Cleaned up some of the scenarios in S2S submission.