Adjusted  dataload
Deleted classes