remove debuge code
remove few warnings.
warnings.
:Merge branch 'master' into jianw_dev