Clean-up corpus location

For CreateCorpus related code