remove unused code and change Class name
remove unused code and change Class name