diff --git a/include/boost/fiber/context.hpp b/include/boost/fiber/context.hpp
index 2a4757e7..e54070d8 100644
--- a/include/boost/fiber/context.hpp
+++ b/include/boost/fiber/context.hpp
@@ -178,7 +178,6 @@ private:
     boost::context::execution_context       ctx_;
 
 public:
-    detail::spinlock                        hook_splk_;
     detail::worker_hook                     worker_hook_;
     detail::terminated_hook                 terminated_hook_;
     detail::ready_hook                      ready_hook_;
@@ -306,7 +305,6 @@ public:
                 suspend();
                 BOOST_ASSERT_MSG( false, "fiber already terminated");
               }),
-        hook_splk_(),
         worker_hook_(),
         terminated_hook_(),
         ready_hook_(),
@@ -409,43 +407,36 @@ public:
 
     template< typename List >
     void worker_link( List & lst) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         lst.push_back( * this);
     }
 
     template< typename List >
     void terminated_link( List & lst) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         lst.push_back( * this);
     }
 
     template< typename List >
     void ready_link( List & lst) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         lst.push_back( * this);
     }
 
     template< typename List >
     void remote_ready_link( List & lst) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         lst.push_back( * this);
     }
 
     template< typename List >
     void yield_link( List & lst) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         lst.push_back( * this);
     }
 
     template< typename Set >
     void sleep_link( Set & set) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         set.insert( * this);
     }
 
     template< typename List >
     void wait_link( List & lst) {
-        std::unique_lock< detail::spinlock > lk( hook_splk_);
         lst.push_back( * this);
     }
 
diff --git a/src/context.cpp b/src/context.cpp
index 459f1e4f..abaa8f14 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -165,7 +165,6 @@ context::context( main_context_t) :
     flags_( flag_main_context),
     scheduler_( nullptr),
     ctx_( boost::context::execution_context::current() ),
-    hook_splk_(),
     worker_hook_(),
     terminated_hook_(),
     ready_hook_(),
@@ -193,7 +192,6 @@ context::context( dispatcher_context_t, boost::context::preallocated const& pall
             // dispatcher context should never return from scheduler::dispatch()
             BOOST_ASSERT_MSG( false, "disatcher fiber already terminated");
           }),
-    hook_splk_(),
     worker_hook_(),
     terminated_hook_(),
     ready_hook_(),
@@ -398,79 +396,66 @@ context::set_properties( fiber_properties * props) {
 
 bool
 context::worker_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return worker_hook_.is_linked();
 }
 
 bool
 context::terminated_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return terminated_hook_.is_linked();
 }
 
 bool
 context::ready_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return ready_hook_.is_linked();
 }
 
 bool
 context::remote_ready_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return remote_ready_hook_.is_linked();
 }
 
 bool
 context::yield_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return yield_hook_.is_linked();
 }
 
 bool
 context::sleep_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return sleep_hook_.is_linked();
 }
 
 bool
 context::wait_is_linked() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     return wait_hook_.is_linked();
 }
 
 void
 context::worker_unlink() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     worker_hook_.unlink();
 }
 
 void
 context::ready_unlink() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     ready_hook_.unlink();
 }
 
 void
 context::remote_ready_unlink() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     remote_ready_hook_.unlink();
 }
 
 void
 context::yield_unlink() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     yield_hook_.unlink();
 }
 
 void
 context::sleep_unlink() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     sleep_hook_.unlink();
 }
 
 void
 context::wait_unlink() {
-    std::unique_lock< detail::spinlock > lk( hook_splk_);
     wait_hook_.unlink();
 }