Clean up DataManager.(wip)