diff --git a/internal/gmm/handler.go b/internal/gmm/handler.go
index 5e0711e9..e492b127 100644
--- a/internal/gmm/handler.go
+++ b/internal/gmm/handler.go
@@ -683,10 +683,11 @@ func HandleInitialRegistration(ue *context.AmfUe, anType models.AccessType) erro
 		param.PreferredLocality = optional.NewString(amfSelf.Locality)
 	}
 
-	if ue.PcfId != "" {
-		// TODO: (step 15) Should use PCF ID to select PCF
-		// Retrieve PCF ID from old AMF
-	}
+	// TODO: (step 15) Should use PCF ID to select PCF
+	// Retrieve PCF ID from old AMF
+	// if ue.PcfId != "" {
+
+	// }
 	for {
 		resp, err := consumer.SendSearchNFInstances(amfSelf.NrfUri, models.NfType_PCF, models.NfType_AMF, &param)
 		if err != nil {
diff --git a/internal/sbi/httpcallback/api_handle_dereg_notification.go b/internal/sbi/httpcallback/api_handle_dereg_notification.go
index 8e32108a..a34833ff 100644
--- a/internal/sbi/httpcallback/api_handle_dereg_notification.go
+++ b/internal/sbi/httpcallback/api_handle_dereg_notification.go
@@ -115,7 +115,7 @@ func HTTPAmfHandleDeregistrationNotification(c *gin.Context) {
 			ue.UeCmRegistered[deregData.AccessType] = false
 		}
 	}
-	
+
 	// TS 23.502 - 4.2.2.2.2 General Registration - 20
 	if ue.PolicyAssociationId != "" {
 		// TODO: It also needs to check if the PCF ID is tranfered to new AMF