diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 73f5eb0f17f21692ec62e368b0d3df690de38fae..ecc189d66097b487b2adc4c64a49aad72a296f97 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2219,164 +2219,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 					}
 						
 				} // end g_CSE_DMR_DEL_013
-							
-						
+												
 			}//end group Delete
-            
-			group Notify {
-            				
-				group g_CSE_DMR_NTF_001 {
-				
-					/**
-					 * @desc Check that the IUT rejects a NOTIFY request when the ResultContent is set to RESULT_CONTENT
-					 * 
-					 */
-					testcase TC_CSE_DMR_NTF_001_RCN_1() runs on Tester system CseSystem {
-						// Local variables
-						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int1));//ResultContent = 1 (attributes)
-						v_ae1.done;
-					}
-													
-					testcase TC_CSE_DMR_NTF_001_RCN_2() runs on Tester system CseSystem {
-						// Local variables
-				 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int2));//ResultContent = 2 (hierarchical address)
-						v_ae1.done;
-			 }
-															
-					testcase TC_CSE_DMR_NTF_001_RCN_3() runs on Tester system CseSystem {
-						// Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int3));//ResultContent = 3 (attributes and hierarchical address)
-						v_ae1.done;
-			}
-																
-					testcase TC_CSE_DMR_NTF_001_RCN_4() runs on Tester system CseSystem {
-						// Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int4));//ResultContent = 4 (attributes and child resources)
-						v_ae1.done;
-			}
-																
-					testcase TC_CSE_DMR_NTF_001_RCN_5() runs on Tester system CseSystem {
-						// Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int5));//ResultContent = 5 (attributes and child resources references)
-						v_ae1.done;
-			}
-																
-					testcase TC_CSE_DMR_NTF_001_RCN_6() runs on Tester system CseSystem {
-						// Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int6));//ResultContent = 6 (child resources references)
-						v_ae1.done;
-			}
-																
-					testcase TC_CSE_DMR_NTF_001_RCN_7() runs on Tester system CseSystem {
-						// Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int7));//ResultContent = 7 (original resource)
-						v_ae1.done;
-			}
-																
-					testcase TC_CSE_DMR_NTF_001_RCN_8() runs on Tester system CseSystem {
-						// Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-												v_ae1.start(f_CSE_DMR_NTF_001(int8));//ResultContent = 8 (child resources)
-						v_ae1.done;
-			}
-				} // end g_CSE_DMR_NTF_001		
-																
-				/**
-				* @desc Check that the IUT returns nothing of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 0 (nothing)
-				* 
-				*/
-			   	testcase TC_CSE_DMR_NTF_002() runs on Tester system CseSystem {
-				   // Local variables
-				var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-				   var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
-																	
-				   v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
-														  	  	
-				   v_ae1.start(f_CSE_DMR_NTF_002());
-				v_ae1.done;
-			}
-																
-				function f_CSE_DMR_NTF_002() runs on AeSimu system CseSystem {
-		     
-					// Local variables
-					var MsgIn v_response;
-				var RequestPrimitive v_request;
-					var integer v_aeIndex, v_ae2Index := -1;
-     	     	
-     	     	//Test control
-				
-				//Test component configuration
-					f_cf01Up(true);
- 	     	      	     	    
-					// Test adapter configuration
-		
-				//Preamble
-					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-			  									
-					vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-		      
-					vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-						
-					v_ae2Index := f_getLatestResource(vc_ae2);
-		      
-					// Test Body
-					v_request := valueof(m_notifyNotification(f_getResourceAddress(v_ae2Index), m_contentNotification_subscriptionVerification(vc_resourcesList[v_ae2Index].resource.aE.aE_ID)));
-					v_request.from_ := f_getOriginator(v_aeIndex, e_ae);
-					v_request.resultContent := int0;
-				
-					vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
-		      
-					f_send(e_mca_port, m_request(v_request));
-			  tc_ac.start;
-			  alt{
-						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, omit))) -> value v_response {
-				  tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ": Nothing provided with RCN set to " & int2str(enum2int(v_request.resultContent)));
-				  }		          
-						[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(omit))) -> value v_response {
-						tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Wrong response status code");
-				}
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
-				  tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Some content provided with RCN set to " & int2str(enum2int(v_request.resultContent)));
-				  }		          
-				[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
-						tc_ac.stop;
-							setverdict(fail, __SCOPE__ & ": Error on the notification");
-				}
-				[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
-				}		        
-			  }
-		      
-					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-    			
-			  // Postamble
-			  f_cse_postamble_deleteResources();	 
-    			
-			  // Tear down
-			  f_cf01Down(); 		      
-		      
-				}//end f_CSE_DMR_NTF_002
-		  
-		  
-
-					
-																	
-														  	  	
-														  	  		
-			}//end group Notify
-																
+            																
 		}//end group Data_Management_and_Repository
     		    
 		group Subscription_And_Notification {