Clean up in DataManager - first half