diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index d8369adb9..db5bae183 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -79,7 +79,6 @@ static void scst_put_acg_work(void *p);
 #else
 static void scst_put_acg_work(struct work_struct *work);
 #endif
-static void scst_del_acn(struct scst_acn *acn);
 static void scst_free_acn(struct scst_acn *acn, bool reassign);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
@@ -4760,7 +4759,7 @@ out_free:
  */
 static void scst_del_acg(struct scst_acg *acg)
 {
-	struct scst_acn *acn, *acnt;
+	struct scst_acn *acn;
 	struct scst_acg_dev *acg_dev, *acg_dev_tmp;
 
 	scst_assert_activity_suspended();
@@ -4772,8 +4771,8 @@ static void scst_del_acg(struct scst_acg *acg)
 				 acg_dev_list_entry)
 		scst_del_acg_dev(acg_dev, false, true);
 
-	list_for_each_entry_safe(acn, acnt, &acg->acn_list, acn_list_entry)
-		scst_del_acn(acn);
+	list_for_each_entry(acn, &acg->acn_list, acn_list_entry)
+		scst_acn_sysfs_del(acn);
 
 #ifdef CONFIG_SCST_PROC
 	list_del(&acg->acg_list_entry);
@@ -5685,14 +5684,6 @@ out_free:
 	goto out;
 }
 
-/* The activity supposed to be suspended and scst_mutex held */
-static void scst_del_acn(struct scst_acn *acn)
-{
-	list_del(&acn->acn_list_entry);
-
-	scst_acn_sysfs_del(acn);
-}
-
 /* The activity supposed to be suspended and scst_mutex held */
 static void scst_free_acn(struct scst_acn *acn, bool reassign)
 {
@@ -5707,7 +5698,8 @@ static void scst_free_acn(struct scst_acn *acn, bool reassign)
 void scst_del_free_acn(struct scst_acn *acn, bool reassign)
 {
 	TRACE_ENTRY();
-	scst_del_acn(acn);
+	list_del(&acn->acn_list_entry);
+	scst_acn_sysfs_del(acn);
 	scst_free_acn(acn, reassign);
 	TRACE_EXIT();
 	return;