Removed various dead codes that are not being referenced
Merge branch 'master' into DeadCodeRemoval
Merge pull request #502 from Benglin/DeadCodeRemoval

Removed various dead codes that are not being referenced