[junjiang2] add some comments, delete the unnecessary code
[junjiang2] bug fix