Cleaned up after deleting the Data objects. Todo: delete the DB-agnostic
Daos.