diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb418d4a..847e8b8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 
 - Add a very rudimentary way of diagnosing validity of steps, IE. whether each step is matching one, and only one, step definition, fixes [#754](https://github.com/badeball/cypress-cucumber-preprocessor/issues/754).
 
+- Remove `And` and `But` from the public API, fixes [#821](https://github.com/badeball/cypress-cucumber-preprocessor/issues/821).
+
 ## v12.2.0
 
 - Total execution time is correctly shown in HTML reports, fixes [#813](https://github.com/badeball/cypress-cucumber-preprocessor/issues/813).
diff --git a/lib/index.ts b/lib/index.ts
index 0fea2ec1..f6aa3681 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -62,13 +62,7 @@ export function defineStep<T extends unknown[]>(
   throw createUnimplemented();
 }
 
-export {
-  defineStep as Given,
-  defineStep as When,
-  defineStep as Then,
-  defineStep as And,
-  defineStep as But,
-};
+export { defineStep as Given, defineStep as When, defineStep as Then };
 
 export function Step(
   world: Mocha.Context,
diff --git a/lib/methods.ts b/lib/methods.ts
index 95b7752a..a47204e1 100644
--- a/lib/methods.ts
+++ b/lib/methods.ts
@@ -126,8 +126,6 @@ export {
   defineStep as Given,
   defineStep as When,
   defineStep as Then,
-  defineStep as And,
-  defineStep as But,
   defineStep,
   runStepDefininition as Step,
   defineParameterType,