Removing unused code.
Merge branch 'master' into removeUnnecessaryCode
Merge pull request #1010 from Microsoft/removeUnnecessaryCode

Removing unused code.