Improvements in data loading and initial cleanup