diff --git a/scst/include/scst.h b/scst/include/scst.h
index 81b70a737..d99e30266 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -427,7 +427,7 @@ enum scst_exec_context {
 #define SCST_TGT_RES_FATAL_ERROR     -3
 
 /*************************************************************
- ** Allowed return codes for dev handler's exec()
+ ** Return codes for dev handler's exec()
  *************************************************************/
 
 /* The cmd is done, go to other ones */
@@ -511,7 +511,7 @@ enum scst_exec_context {
 /* Set if tgt_dev is RESERVED by another session */
 #define SCST_TGT_DEV_RESERVED		1
 
-/* Set if the corresponding context is atomic */
+/* Set if the corresponding context should be atomic */
 #define SCST_TGT_DEV_AFTER_INIT_WR_ATOMIC	5
 #define SCST_TGT_DEV_AFTER_EXEC_ATOMIC		6
 
diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index 22d9f97b4..1ddde00aa 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -172,14 +172,13 @@ enum scst_cdb_flags {
 	SCST_INFO_VALID =			0x0010, /* must be single bit */
 	SCST_VERIFY_BYTCHK_MISMATCH_ALLOWED =	0x0020,
 	SCST_IMPLICIT_HQ =			0x0040,
-	SCST_IMPLICIT_ORDERED =			0x0080, /* ToDo: remove it's nonsense */
-	SCST_SKIP_UA =				0x0100,
-	SCST_WRITE_MEDIUM =			0x0200,
-	SCST_LOCAL_CMD =			0x0400,
-	SCST_FULLY_LOCAL_CMD =			0x0800,
-	SCST_REG_RESERVE_ALLOWED =		0x1000,
-	SCST_WRITE_EXCL_ALLOWED =		0x2000,
-	SCST_EXCL_ACCESS_ALLOWED =		0x4000,
+	SCST_SKIP_UA =				0x0080,
+	SCST_WRITE_MEDIUM =			0x0100,
+	SCST_LOCAL_CMD =			0x0200,
+	SCST_FULLY_LOCAL_CMD =			0x0400,
+	SCST_REG_RESERVE_ALLOWED =		0x0800,
+	SCST_WRITE_EXCL_ALLOWED =		0x1000,
+	SCST_EXCL_ACCESS_ALLOWED =		0x2000,
 #ifdef CONFIG_SCST_TEST_IO_IN_SIRQ
 	SCST_TEST_IO_IN_SIRQ_ALLOWED =		0x8000,
 #endif
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index f641b08bf..1f984e612 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -271,7 +271,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 			 SCST_WRITE_EXCL_ALLOWED,
 	 2, get_trans_len_3},
 	{0x15, "OMOOOOOOOOOOOOOO", "MODE SELECT(6)",
-	 SCST_DATA_WRITE, SCST_IMPLICIT_ORDERED, 4, get_trans_len_1},
+	 SCST_DATA_WRITE, FLAG_NONE, 4, get_trans_len_1},
 	{0x16, "MMMMMMMMMMMMMMMM", "RESERVE",
 	 SCST_DATA_NONE, SCST_SMALL_TIMEOUT|SCST_LOCAL_CMD|
 			 SCST_WRITE_EXCL_ALLOWED|SCST_EXCL_ACCESS_ALLOWED,
@@ -433,7 +433,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 	{0x4B, "     O          ", "PAUSE/RESUME",
 	 SCST_DATA_NONE, FLAG_NONE, 0, get_trans_len_none},
 	{0x4C, "OOOOOOOOOOOOOOOO", "LOG SELECT",
-	 SCST_DATA_WRITE, SCST_IMPLICIT_ORDERED, 7, get_trans_len_2},
+	 SCST_DATA_WRITE, FLAG_NONE, 7, get_trans_len_2},
 	{0x4D, "OOOOOOOOOOOOOOOO", "LOG SENSE",
 	 SCST_DATA_READ, SCST_SMALL_TIMEOUT|
 			 SCST_REG_RESERVE_ALLOWED|
@@ -459,7 +459,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 	{0x54, "     O          ", "SEND OPC INFORMATION",
 	 SCST_DATA_WRITE, FLAG_NONE, 7, get_trans_len_2},
 	{0x55, "OOOOOOOOOOOOOOOO", "MODE SELECT(10)",
-	 SCST_DATA_WRITE, SCST_IMPLICIT_ORDERED, 7, get_trans_len_2},
+	 SCST_DATA_WRITE, FLAG_NONE, 7, get_trans_len_2},
 	{0x56, "OOOOOOOOOOOOOOOO", "RESERVE(10)",
 	 SCST_DATA_NONE, SCST_SMALL_TIMEOUT|SCST_LOCAL_CMD,
 	 0, get_trans_len_none},