Merge pull request #504 from iamqizhao/master

remove some commented code left from previous PRs