Move a class method to the top of the file
Remove some dead code from Scenario
This method doesn't need to be in the public API