Cleaned old stuff from data manager