diff --git a/unified/ql/lib/codeql/unified/Ast.qll b/unified/ql/lib/codeql/unified/Ast.qll
index 2f84aedd412..4ad61ff353b 100644
--- a/unified/ql/lib/codeql/unified/Ast.qll
+++ b/unified/ql/lib/codeql/unified/Ast.qll
@@ -349,9 +349,6 @@ module Unified {
     /** Gets the node corresponding to the field `body`. */
     final Block getBody() { unified_catch_clause_def(this, result) }
 
-    /** Gets the node corresponding to the field `guard`. */
-    final Expr getGuard() { unified_catch_clause_guard(this, result) }
-
     /** Gets the node corresponding to the field `modifier`. */
     final Modifier getModifier(int i) { unified_catch_clause_modifier(this, i, result) }
 
@@ -361,7 +358,6 @@ module Unified {
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
       unified_catch_clause_def(this, result) or
-      unified_catch_clause_guard(this, result) or
       unified_catch_clause_modifier(this, _, result) or
       unified_catch_clause_pattern(this, result)
     }
@@ -1147,9 +1143,6 @@ module Unified {
     /** Gets the node corresponding to the field `body`. */
     final Block getBody() { unified_switch_case_def(this, result) }
 
-    /** Gets the node corresponding to the field `guard`. */
-    final Expr getGuard() { unified_switch_case_guard(this, result) }
-
     /** Gets the node corresponding to the field `modifier`. */
     final Modifier getModifier(int i) { unified_switch_case_modifier(this, i, result) }
 
@@ -1159,7 +1152,6 @@ module Unified {
     /** Gets a field or child node of this node. */
     final override AstNode getAFieldOrChild() {
       unified_switch_case_def(this, result) or
-      unified_switch_case_guard(this, result) or
       unified_switch_case_modifier(this, _, result) or
       unified_switch_case_pattern(this, result)
     }
@@ -1563,8 +1555,6 @@ module Unified {
       or
       result = node.(CatchClause).getBody() and i = -1 and name = "getBody"
       or
-      result = node.(CatchClause).getGuard() and i = -1 and name = "getGuard"
-      or
       result = node.(CatchClause).getModifier(i) and name = "getModifier"
       or
       result = node.(CatchClause).getPattern() and i = -1 and name = "getPattern"
@@ -1749,8 +1739,6 @@ module Unified {
       or
       result = node.(SwitchCase).getBody() and i = -1 and name = "getBody"
       or
-      result = node.(SwitchCase).getGuard() and i = -1 and name = "getGuard"
-      or
       result = node.(SwitchCase).getModifier(i) and name = "getModifier"
       or
       result = node.(SwitchCase).getPattern() and i = -1 and name = "getPattern"
diff --git a/unified/ql/lib/unified.dbscheme b/unified/ql/lib/unified.dbscheme
index 8ff0a75cc67..8306c3fcf0c 100644
--- a/unified/ql/lib/unified.dbscheme
+++ b/unified/ql/lib/unified.dbscheme
@@ -292,11 +292,6 @@ unified_call_expr_def(
   int callee: @unified_expr_or_type ref
 );
 
-unified_catch_clause_guard(
-  unique int unified_catch_clause: @unified_catch_clause ref,
-  unique int guard: @unified_expr ref
-);
-
 #keyset[unified_catch_clause, index]
 unified_catch_clause_modifier(
   int unified_catch_clause: @unified_catch_clause ref,
@@ -780,7 +775,7 @@ unified_parameter_def(
   unique int id: @unified_parameter
 );
 
-@unified_pattern = @unified_bulk_importing_pattern | @unified_constructor_pattern | @unified_expr_equality_pattern | @unified_name_pattern | @unified_or_pattern | @unified_token_ignore_pattern | @unified_token_unsupported_node | @unified_tuple_pattern
+@unified_pattern = @unified_bulk_importing_pattern | @unified_conditional_pattern | @unified_constructor_pattern | @unified_expr_equality_pattern | @unified_name_pattern | @unified_or_pattern | @unified_token_ignore_pattern | @unified_token_unsupported_node | @unified_tuple_pattern
 
 unified_pattern_element_key(
   unique int unified_pattern_element: @unified_pattern_element ref,
@@ -816,11 +811,6 @@ unified_return_expr_def(
 
 @unified_stmt = @unified_accessor_declaration | @unified_class_like_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_do_while_stmt | @unified_expr | @unified_for_each_stmt | @unified_function_declaration | @unified_guard_if_stmt | @unified_import_declaration | @unified_labeled_stmt | @unified_operator_syntax_declaration | @unified_type_alias_declaration | @unified_variable_declaration | @unified_while_stmt
 
-unified_switch_case_guard(
-  unique int unified_switch_case: @unified_switch_case ref,
-  unique int guard: @unified_expr ref
-);
-
 #keyset[unified_switch_case, index]
 unified_switch_case_modifier(
   int unified_switch_case: @unified_switch_case ref,