[Yi]do some refactoring for MatchService
[Yi] Remove the unused classes