diff --git a/src/lib-sieve/plugins/include/cmd-global.c b/src/lib-sieve/plugins/include/cmd-global.c
index 01862c058e0a6382cf6c405e219247e876d62f77..a6dce8d4a8a9c09c30d105965b8a8cecc3cb21e7 100644
--- a/src/lib-sieve/plugins/include/cmd-global.c
+++ b/src/lib-sieve/plugins/include/cmd-global.c
@@ -39,41 +39,6 @@ const struct sieve_command_def cmd_global = {
 	.generate = cmd_global_generate,
 };
 
-/* DEPRICATED:
- */
-
-/* Import command
- *
- * Syntax
- *   import
- */
-const struct sieve_command_def cmd_import = {
-	.identifier = "import",
-	.type = SCT_COMMAND,
-	.positional_args = 1,
-	.subtests = 0,
-	.block_allowed = FALSE,
-	.block_required = FALSE,
-	.validate = cmd_global_validate,
-	.generate = cmd_global_generate,
-};
-
-/* Export command
- *
- * Syntax
- *   export
- */
-const struct sieve_command_def cmd_export = {
-	.identifier = "export",
-	.type = SCT_COMMAND,
-	.positional_args = 1,
-	.subtests = 0,
-	.block_allowed = FALSE,
-	.block_required = FALSE,
-	.validate = cmd_global_validate,
-	.generate = cmd_global_generate,
-};
-
 /*
  * Operations
  */
@@ -115,22 +80,6 @@ cmd_global_validate(struct sieve_validator *valdtr, struct sieve_command *cmd)
 	struct sieve_ast_argument *arg = cmd->first_positional;
 	struct sieve_command *prev = sieve_command_prev(cmd);
 
-	/* DEPRECATED: Check valid command placement */
-	if (!sieve_command_is(cmd, cmd_global)) {
-		if (!sieve_command_is_toplevel(cmd) ||
-		    (!sieve_command_is_first(cmd) && prev != NULL &&
-		     !sieve_command_is(prev, cmd_require) &&
-		     !sieve_command_is(prev, cmd_import) &&
-		     !sieve_command_is(prev, cmd_export))) {
-			sieve_command_validate_error(valdtr, cmd,
-				"the DEPRECATED %s command can only be placed at top level "
-				"at the beginning of the file after any require or "
-				"import/export commands",
-				sieve_command_identifier(cmd));
-			return FALSE;
-		}
-	}
-
 	/* Check for use of variables extension */
 	if (!ext_include_validator_have_variables(this_ext, valdtr)) {
 		sieve_command_validate_error(
diff --git a/src/lib-sieve/plugins/include/ext-include-common.h b/src/lib-sieve/plugins/include/ext-include-common.h
index 44bfe9ac0af25b40ee5a3f65da5c9a21065d6cc1..ca586b7e60918f9f019416ecd944b75ace231937 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.h
+++ b/src/lib-sieve/plugins/include/ext-include-common.h
@@ -64,10 +64,6 @@ extern const struct sieve_command_def cmd_include;
 extern const struct sieve_command_def cmd_return;
 extern const struct sieve_command_def cmd_global;
 
-/* DEPRICATED */
-extern const struct sieve_command_def cmd_import;
-extern const struct sieve_command_def cmd_export;
-
 /*
  * Operations
  */
diff --git a/src/lib-sieve/plugins/include/ext-include.c b/src/lib-sieve/plugins/include/ext-include.c
index 0c22467c2d243de64ef8a7d4654417c903611993..f85bd2489b170baf837bdba898c8575fbea63760 100644
--- a/src/lib-sieve/plugins/include/ext-include.c
+++ b/src/lib-sieve/plugins/include/ext-include.c
@@ -90,10 +90,6 @@ ext_include_validator_load(const struct sieve_extension *ext,
 	sieve_validator_register_command(valdtr, ext, &cmd_return);
 	sieve_validator_register_command(valdtr, ext, &cmd_global);
 
-	/* DEPRICATED */
-	sieve_validator_register_command(valdtr, ext, &cmd_import);
-	sieve_validator_register_command(valdtr, ext, &cmd_export);
-
 	/* Initialize global variables namespace */
 	ext_include_variables_global_namespace_init(ext, valdtr);
 
diff --git a/tests/extensions/include/errors.svtest b/tests/extensions/include/errors.svtest
index 6f8b1cce709acd1f2182223b8ca3fd7eed5ceb48..f07f8012af2ca4981e22229e8374a1f069b96126 100644
--- a/tests/extensions/include/errors.svtest
+++ b/tests/extensions/include/errors.svtest
@@ -70,7 +70,7 @@ test "Variables" {
 		test_fail "compile should have failed";
 	}
 
-	if not test_error :count "eq" :comparator "i;ascii-numeric" "3" {
+	if not test_error :count "eq" :comparator "i;ascii-numeric" "2" {
 		test_fail "wrong number of errors reported";
 	}
 }
diff --git a/tests/extensions/include/errors/variables.sieve b/tests/extensions/include/errors/variables.sieve
index eac99f8c81bb85e00eae34fb3116672af4c0e60b..7b29ff256bd3eb81a6f9dde1d80d2810e43e86cc 100644
--- a/tests/extensions/include/errors/variables.sieve
+++ b/tests/extensions/include/errors/variables.sieve
@@ -10,14 +10,7 @@ keep;
 # Global after command not being require or global (not an error)
 global "friep";
 
-# DEPRECATED: import/export after command not being require or import/export
-export "friep";
-import "friep";
-
 # Marking local variable as global
 set "frutsels" "frop";
 global "frutsels";
 set "frutsels" "frop";
-
-
-