diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 6c45eb287..51d5e1a74 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -12336,12 +12336,6 @@ int scst_block_generic_dev_done(struct scst_cmd *cmd,
 
 	TRACE_ENTRY();
 
-	/*
-	 * SCST sets good defaults for cmd->is_send_status and
-	 * cmd->resp_data_len based on cmd->status and cmd->data_direction,
-	 * therefore change them only if necessary
-	 */
-
 	/*
 	 * Potentially, a pass-through backend device can at any time change
 	 * block size behind us, e.g. after FORMAT command, so we need to
@@ -12374,9 +12368,6 @@ int scst_block_generic_dev_done(struct scst_cmd *cmd,
 		}
 	}
 
-	TRACE_DBG("cmd->is_send_status=%x, cmd->resp_data_len=%d, "
-	      "res=%d", cmd->is_send_status, cmd->resp_data_len, res);
-
 out:
 	TRACE_EXIT_RES(res);
 	return res;
@@ -12398,12 +12389,6 @@ int scst_tape_generic_dev_done(struct scst_cmd *cmd,
 
 	TRACE_ENTRY();
 
-	/*
-	 * SCST sets good defaults for cmd->is_send_status and
-	 * cmd->resp_data_len based on cmd->status and cmd->data_direction,
-	 * therefore change them only if necessary
-	 */
-
 	if (unlikely(!scst_cmd_completed_good(cmd)))
 		goto out;