diff -r 22c3c67e5001 -r c45d4fe2ff0a bearermanagement/S60MCPR/src/s60mcprmobilityactivity.cpp
--- a/bearermanagement/S60MCPR/src/s60mcprmobilityactivity.cpp	Tue Apr 27 17:03:25 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mcprmobilityactivity.cpp	Tue May 11 16:35:05 2010 +0300
@@ -198,24 +198,6 @@
         // else cancel
         return KCancelTag | NetStateMachine::EForward;
         }
-
-    // -----------------------------------------------------------------------------
-    // S60MCprMobilityActivity::TInformMigrationCompletedOrError::TransitionTag
-    // -----------------------------------------------------------------------------
-    //
-    DEFINE_SMELEMENT( TInformMigrationCompletedOrError, NetStateMachine::MStateFork, TContext )
-    TBool TInformMigrationCompletedOrError::TransitionTag()
-        {    
-        // Error notification falls into the error -case.
-        if ( iContext.iNodeActivity->Error() ) 
-            {   
-            return MeshMachine::KErrorTag | NetStateMachine::EForward;
-            }
-        else
-            {
-            return S60MCprStates::KInformMigrationCompleted;
-            }
-        }
         
     // -----------------------------------------------------------------------------
     // S60MCprMobilityActivity::TStartMobilityHandshakeBackwardsOrError::TransitionTag
@@ -695,36 +677,6 @@
         }
 
     // -----------------------------------------------------------------------------
-    // CS60MobilityActivity::TNoTagOrRequestReConnectToCurrentSPOrErrorTag::DoL
-    // -----------------------------------------------------------------------------
-    //
-    DEFINE_SMELEMENT( CS60MobilityActivity::TNoTagOrRequestReConnectToCurrentSPOrErrorTag, 
-                      NetStateMachine::MStateFork, CS60MobilityActivity::TContext )
-    TInt CS60MobilityActivity::TNoTagOrRequestReConnectToCurrentSPOrErrorTag::TransitionTag()
-        {
-        CS60MetaConnectionProvider& node = (CS60MetaConnectionProvider&)iContext.Node();
-        RMetaServiceProviderInterface* sp = (RMetaServiceProviderInterface*)node.ServiceProvider();
-
-        if ( iContext.iNodeActivity->Error() )
-            {
-            S60MCPRLOGSTRING1("S60MCPR<%x>::TNoTagOrBearerPresentOrError::TransitionTag() KErrorTag",(TInt*)&iContext.Node())
-            return MeshMachine::KErrorTag | NetStateMachine::EForward;
-            }
-            // Check whether we're bound to a provider for the given IAP ID already
-        else if (sp && sp->ProviderInfo().APId() == node.PolicyPrefs().IapId())
-            {
-            // Restart the whole layer
-            S60MCPRLOGSTRING1("S60MCPR<%x>::TNoTagOrBearerPresentOrError::TransitionTag() Re-establishment",(TInt*)&iContext.Node());
-            return S60MCprStates::KRequestReConnectToCurrentSP | NetStateMachine::EForward;
-            }
-        else
-            {
-            S60MCPRLOGSTRING1("S60MCPR<%x>::TNoTagOrBearerPresentOrError::TransitionTag() KNoTag",(TInt*)&iContext.Node())
-            return MeshMachine::KNoTag | NetStateMachine::EForward;
-            }
-        }    
-    
-    // -----------------------------------------------------------------------------
     // CS60MobilityActivity::ClearHandshakingFlag
     // -----------------------------------------------------------------------------
     //