Remove some outdated code.
Merge pull request #3886 from edx/diana/clean-up-outdated-files

Remove some outdated code.