Revert Merge of E734

Hao Liu:

"i forgot to remove the deprecated code from previous semester project (E732) from my code before i submit the pull request"