Fix datastorage mem leak