diff --git a/examples/notebooks/API_Example.ipynb b/examples/notebooks/API_Example.ipynb
index a9265c701..9122b8f99 100644
--- a/examples/notebooks/API_Example.ipynb
+++ b/examples/notebooks/API_Example.ipynb
@@ -12,7 +12,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 10,
    "id": "743dfe47",
    "metadata": {},
    "outputs": [],
@@ -36,7 +36,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 11,
    "id": "1061722d",
    "metadata": {},
    "outputs": [],
@@ -56,7 +56,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 15,
    "id": "5107f6f9",
    "metadata": {},
    "outputs": [],
@@ -76,7 +76,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 17,
    "id": "f0380d35",
    "metadata": {},
    "outputs": [],
diff --git a/fedn/fedn/network/combiner/aggregators/fedavg.py b/fedn/fedn/network/combiner/aggregators/fedavg.py
index 0335af761..ddec19af2 100644
--- a/fedn/fedn/network/combiner/aggregators/fedavg.py
+++ b/fedn/fedn/network/combiner/aggregators/fedavg.py
@@ -78,7 +78,7 @@ def combine_models(self, helper=None, delete_models=True):
                 if delete_models:
                     self.modelservice.models.delete(model_update.model_update_id)
                     logger.info(
-                        "AGGREGATOR({}): Deleted model update {} from storage.".format(self.name, model_id))
+                        "AGGREGATOR({}): Deleted model update {} from storage.".format(self.name, model_update.model_update_id))
                 self.model_updates.task_done()
             except Exception as e:
                 logger.error(
diff --git a/fedn/fedn/network/combiner/aggregators/fedopt.py b/fedn/fedn/network/combiner/aggregators/fedopt.py
index 8f7ccc2df..9794bc597 100644
--- a/fedn/fedn/network/combiner/aggregators/fedopt.py
+++ b/fedn/fedn/network/combiner/aggregators/fedopt.py
@@ -93,9 +93,9 @@ def combine_models(self, helper=None, delete_models=True):
                 nr_aggregated_models += 1
                 # Delete model from storage
                 if delete_models:
-                    self.modelservice.models.delete(model_update.model_id)
+                    self.modelservice.models.delete(model_update.model_update_id)
                     logger.info(
-                        "AGGREGATOR({}): Deleted model update {} from storage.".format(self.name, model_id))
+                        "AGGREGATOR({}): Deleted model update {} from storage.".format(self.name, model_update.model_update_id))
                 self.model_updates.task_done()
             except Exception as e:
                 logger.error(