Actually delete files (completes #1807)
Merge pull request #1809 from erictune/dev_doc

Actually delete files which were moved in #1807