Removed deadlock in trim
Merge branch 'master' of https://github.com/mortonjt/SCOPE