remove debuge code
:Merge branch 'master' into jianw_dev
remove debug code
return value check