Merge pull request #279 from mhotan/phase_4_dev

Removed unnecessary files