[maintain] do some cleanup
Merge pull request #196 from haiwen/maintain_patch_1

[maintain] do some cleanup