Fixing some broken clean stuff--we have to make sure the data files still exist
Merging?