Remove unused import
Combine compound matcher tests
Clean out unused code