deleted redundant classes
Merge branch 'master' of https://github.com/ben8987/tmtest