Fixed duplicate files from Rhy's merge, remove dataExport dependency erroneously added
Fixed duplicate files from Rhy's merge, remove dataExport dependency erroneously added

ian-james/IFS,ian-james/IFS,ian-james/IFS,ian-james/IFS,ian-james/IFS,ian-james/IFS