DataManager - hack cleaning