diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index 9e315714ab59aa8dac3b3de3c7b626f86b91e9f8..722eb0a113265f456e3044a81ff7ff7dd31c30d3 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -114,7 +114,6 @@
     "    show_processed_modules,\n",
     ")\n",
     "from cal_tools.tools import (\n",
-    "    CalibrationMetadata,\n",
     "    get_dir_creation_date,\n",
     "    get_from_db,\n",
     "    get_pdu_from_db,\n",
@@ -1003,4 +1002,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
\ No newline at end of file
diff --git a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
index 2badff4d2fb8c0c5cddc63f56f619adb11b61824..9492f7d9bf16e73fc0b4b9ebef560bca0ad962fa 100644
--- a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
+++ b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
@@ -16,12 +16,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-02-20T12:42:51.255184Z",
-     "start_time": "2019-02-20T12:42:51.225500Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "cluster_profile = \"noDB\" # The ipcluster profile to use\n",
@@ -66,12 +61,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-02-20T12:42:52.599660Z",
-     "start_time": "2019-02-20T12:42:51.472138Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "import os\n",
@@ -157,12 +147,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-02-20T12:42:52.608214Z",
-     "start_time": "2019-02-20T12:42:52.601257Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "print(\"Parameters are:\")\n",
@@ -189,12 +174,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-02-20T12:42:54.024731Z",
-     "start_time": "2019-02-20T12:42:53.901555Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# set everything up filewise\n",
@@ -216,12 +196,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-02-20T10:50:55.839958Z",
-     "start_time": "2019-02-20T10:50:55.468134Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "import copy\n",
@@ -462,12 +437,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2018-12-06T09:38:18.234582Z",
-     "start_time": "2018-12-06T09:38:18.222838Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "res = OrderedDict()\n",
@@ -484,12 +454,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2018-12-06T09:49:32.449330Z",
-     "start_time": "2018-12-06T09:49:20.231607Z"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Push the same constant two different times.\n",
@@ -562,13 +527,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2018-12-06T09:49:14.540552Z",
-     "start_time": "2018-12-06T09:49:13.009674Z"
-    },
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "cell = 9\n",
@@ -580,9 +539,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "cols = {BadPixels.NOISE_OUT_OF_THRESHOLD.value: (BadPixels.NOISE_OUT_OF_THRESHOLD.name, '#FF000080'),\n",
@@ -631,9 +588,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "create_constant_overview(noise_g, \"Noise (ADU)\", max_cells, 0, 100, entries=1)"
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index f2c30ea812c734ff96a8b35aabadd74ea5b330ae..d6ff625f12155701a5c84355fdc2530560a828c3 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -98,7 +98,6 @@
     "    show_processed_modules,\n",
     ")\n",
     "from cal_tools.tools import (\n",
-    "    CalibrationMetadata,\n",
     "    get_dir_creation_date,\n",
     "    get_from_db,\n",
     "    get_notebook_name,\n",
@@ -683,9 +682,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "cell = 12\n",