diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index 19206fc2b559670d62febcf698286079fe1849be..2ab8799a3819cb0f5e69c31e708a6a22dc1b8a7f 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -53,9 +53,6 @@
     "# Parameters for plotting\n",
     "skip_plots = False  # exit after writing corrected files\n",
     "\n",
-    "# TODO: Remove\n",
-    "db_module = [\"\"]  # ID of module in calibration database, this parameter is ignore in the notebook. TODO: remove from calibration_configurations.\n",
-    "\n",
     "\n",
     "def balance_sequences(in_folder, run, sequences, sequences_per_node, karabo_da):\n",
     "    from xfel_calibrate.calibrate import balance_sequences as bs\n",
@@ -221,18 +218,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "condition = {\n",
-    "    \"memory_cells\": memory_cells,\n",
-    "    \"bias_voltage\": bias_voltage,\n",
-    "    \"integration_time\": integration_time,\n",
-    "    \"gain_setting\": gain_setting,\n",
-    "}\n",
-    "# TODO: Currently there are no gain constants for fixed gain mode.\n",
-    "# This should not be the case in the future.\n",
-    "gain_condition = Conditions.Dark.jungfrau(**condition)\n",
-    "\n",
-    "condition[\"gain_mode\"] = gain_mode\n",
-    "dark_condition = Conditions.Dark.jungfrau(**condition)\n",
+    "condition = Conditions.Dark.jungfrau(\n",
+    "    memory_cells=memory_cells,\n",
+    "    bias_voltage=bias_voltage,\n",
+    "    integration_time=integration_time,\n",
+    "    gain_setting=gain_setting,\n",
+    "    gain_mode=gain_mode,\n",
+    ")\n",
     "\n",
     "\n",
     "def get_constants_for_module(karabo_da: str):\n",
@@ -257,22 +249,22 @@
     "        print_once=False,\n",
     "    )\n",
     "    offset_map, when[\"Offset\"] = retrieval_function(\n",
-    "        condition=dark_condition,\n",
+    "        condition=condition,\n",
     "        constant=Constants.jungfrau.Offset(),\n",
     "        empty_constant=np.zeros((512, 1024, memory_cells, 3))\n",
     "    )\n",
     "    mask, when[\"BadPixelsDark\"] = retrieval_function(\n",
-    "        condition=dark_condition,\n",
+    "        condition=condition,\n",
     "        constant=Constants.jungfrau.BadPixelsDark(),\n",
     "        empty_constant=np.zeros((512, 1024, memory_cells, 3), dtype=np.uint32),\n",
     "    )\n",
     "    mask_ff, when[\"BadPixelsFF\"] = retrieval_function(\n",
-    "        condition=gain_condition,\n",
+    "        condition=condition,\n",
     "        constant=Constants.jungfrau.BadPixelsFF(),\n",
     "        empty_constant=None\n",
     "    )\n",
     "    gain_map, when[\"Gain\"] = retrieval_function(\n",
-    "        condition=gain_condition,\n",
+    "        condition=condition,\n",
     "        constant=Constants.jungfrau.RelativeGain(),\n",
     "        empty_constant=None\n",
     "    )\n",