Merge pull request #1745 from naylor-b/simplify

removed stepping
interim.  24 non-gui test failures