diff --git a/Mesh_3/demo/Mesh_3/config.h b/Mesh_3/demo/Mesh_3/config.h
index 1d05a10e1e4..bfa4d9ccbcb 100644
--- a/Mesh_3/demo/Mesh_3/config.h
+++ b/Mesh_3/demo/Mesh_3/config.h
@@ -13,7 +13,6 @@
 //#define CGAL_MESH_3_EXUDER_HIGH_VERBOSITY
 //#define CGAL_MESH_3_VERY_VERBOSE
 #define CGAL_MESH_3_IO_VERBOSE
-#define CGAL_DEBUG_GLOBAL_LOCK_DS // CJTODO TEMP
 
 //#define SHOW_REMAINING_BAD_ELEMENT_IN_RED
 
diff --git a/STL_Extension/include/CGAL/Spatial_lock_grid_3.h b/STL_Extension/include/CGAL/Spatial_lock_grid_3.h
index 5ff51b1e2f0..60289f28727 100644
--- a/STL_Extension/include/CGAL/Spatial_lock_grid_3.h
+++ b/STL_Extension/include/CGAL/Spatial_lock_grid_3.h
@@ -53,30 +53,7 @@ struct Tag_priority_blocking {};
 template <typename Derived>
 class Spatial_lock_grid_base_3
 {
-
-#ifdef CGAL_DEBUG_GLOBAL_LOCK_DS
-// Just a simple way to store a global pointer to a grid locking data structure
-// for debugging purpose...
-
 private:
-  static Derived*& debug_global_lock_ds()
-  {
-    static Derived *p_g_lock_ds = NULL;
-    return p_g_lock_ds;
-  }
-public:
-  static Derived* get_global_lock_ds()
-  {
-    return debug_global_lock_ds();
-  }
-  static void set_global_lock_ds(Derived *ds)
-  {
-    debug_global_lock_ds() = ds;
-  }
-#endif
-
-private:
-
   static bool *init_TLS_grid(int num_cells_per_axis)
   {
     int num_cells = num_cells_per_axis*
diff --git a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
index 643a23180a0..5e8ac9d03f7 100644
--- a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
@@ -453,28 +453,6 @@ private:
 
 public:
 
-#ifdef CGAL_LINKED_WITH_TBB
-  // CJTODO TEMP
-#ifdef CGAL_DEBUG_GLOBAL_LOCK_DS
-  template <typename Cell_handle>
-  bool is_cell_locked_by_this_thread(const Cell_handle &cell_handle) const
-  {
-    CGAL::Spatial_lock_grid_3<Tag_priority_blocking> *lock_ds = 
-      CGAL::Spatial_lock_grid_3::get_global_lock_ds();
-    bool locked = true;
-    if (lock_ds)
-    {
-      for (int iVertex = 0 ; locked && iVertex < 4 ; ++iVertex)
-      {
-        locked = lock_ds->is_locked_by_this_thread(
-          cell_handle->vertex(iVertex)->point());
-      }
-    }
-    return locked;
-  }
-#endif
-#endif
-
   // Internal function : assumes the conflict cells are marked.
   template <class CellIt>
   Vertex_handle _insert_in_hole(CellIt cell_begin, CellIt cell_end,