rm unused
Merge branch 'clean-tests'