fixed the issues2
Merge branch 'issues2'
remove lots of useless comments or old codes that have been commented for a long time.