diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index df4133eb1374da718ecec54fe469fc25d0163973..2ee083567f9a29b5cfd5028c34f64be94939e1f3 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4251,10 +4251,6 @@ module OneM2M_Functions {
 					}	
 				}  
 			} else if (p_resourceType == int4) {//contentInstance
-				//creator attribute
-				if(ispresent(p_request.primitiveContent.contentInstance.creator)) {
-					p_request.primitiveContent.contentInstance.creator := f_getCreator(p_parentIndex);
-				}
 			}
 
 			return valueof(p_request);
@@ -4522,27 +4518,7 @@ module OneM2M_Functions {
 				return f_getOriginator(vc_resourcesList[p_targetResourceIndex].parentIndex);
 			}
 		}
-		
-		/**
-		 * @desc Resolution of the creator attribute for a given resource
-		 * @param p_targetResourceIndex Internal resource index of the given resource
-		 * @return AE-ID or CSE-ID of the entity creating the given resource
-		 * @verdict 
-		 */
-		function f_getCreator(integer  p_targetResourceIndex := -1) runs on Tester return XSD.ID {
-				
-			if(p_targetResourceIndex == -1) {
-				return PX_CSE_ID;
-			}	
-				
-			if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
-				return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
-			} else {
-				return f_getCreator(vc_resourcesList[p_targetResourceIndex].parentIndex);
-			}
-			
-		}
-			
+					
 		/**
 		 * @desc Return of a index of a specific attribute from an attributeList by attributeName
 		 * @param p_attributeList Target attributeList
@@ -4837,22 +4813,6 @@ module OneM2M_Functions {
 			}
 				
 		}
-
-		/**
-		 * @desc Retrieve AE_ID for a given AE resource
-		 * @param p_targetResourceIndex Internal resource index of the given resource
-		 * @return AE_ID of the given resource
-		 */
-		function f_getAeId(integer  p_targetResourceIndex := -1) runs on Tester return XSD.ID {
-			
-			if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
-				return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
-			}
-			
-			log(__SCOPE__ & ":WARNING: p_targetResourceIndex does not refer to AE resource");
-			return "";
-			
-		} // end f_getAeId
 		
 		/**
 		 * @desc Retrieve Announced Resource Type from the given resource type
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index dc629c1ea24e05d4d817f7224f3eaf02537dab53..45e5e0c9f39eb718989bfab6cb6f8da15ccd0a0b 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2587,7 +2587,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 					// Preamble
 					v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-					v_contentResponse.uRI := f_getAeId(v_aeIndex);
+					v_contentResponse.uRI := vc_resourcesList[v_aeIndex].resource.aE.aE_ID;
 					
 					f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);