Removed some unused codes.
Merge pull request #2026 from dumganhar/master

Removed some unused codes.