diff --git a/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py b/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py
index a67d5e1fdd93c0ed9202254bc0b1796ca5f87cb3..43851faf0ce6a4b4f04104c1f7e1febb7d0ecf9b 100644
--- a/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py
+++ b/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py
@@ -251,9 +251,6 @@ def can_run_anywhere_within_timewindow_with_sky_constraints(scheduling_unit: mod
     Checks whether it is possible to place the scheduling unit arbitrarily in the given time window, i.e. the sky constraints must be met over the full time window.
     :return: True if all sky constraints are met over the entire time window, else False.
     """
-    # TODO: remove this shortcut after demo
-    return True
-
     constraints = scheduling_unit.draft.scheduling_constraints_doc
     if not "sky" in constraints:
         return True
diff --git a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
index e0ba243a557573c5eb59cae779d8fd67e1db2c27..e002406552610d0ad2fa3dbb1fabd7a6ef5bbdc7 100755
--- a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
+++ b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
@@ -1704,4 +1704,4 @@ logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=loggin
 
 if __name__ == '__main__':
     #run the unit tests
-    unittest.main(defaultTest='TestDynamicScheduling.test_can_schedule_all_observing_strategy_templates_with_default_constraints')
+    unittest.main()