Cleanup datastore usage, moved to model