Remove manual calls to `scope.destroy`

Cleanup is now automatically added to tests by
`Scaffold.create_test_dict`.
Merge branch 'master' of github.com:FFM/FFM