DataManager clean-up