Tidy up and remove redundant classes and tests

No match.