Remove duplicate code
Merge pull request #555 from luogankun/luogankun02

Remove duplicate code