diff --git a/jOOQ/src/main/java/org/jooq/ExecuteContext.java b/jOOQ/src/main/java/org/jooq/ExecuteContext.java
index b72eea388a..aae8df6fbc 100644
--- a/jOOQ/src/main/java/org/jooq/ExecuteContext.java
+++ b/jOOQ/src/main/java/org/jooq/ExecuteContext.java
@@ -45,7 +45,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
-import java.util.Map;
 
 import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
@@ -60,56 +59,6 @@ import org.jooq.exception.DataAccessException;
  */
 public interface ExecuteContext extends Scope {
 
-    /**
-     * Get all custom data from this <code>ExecuteContext</code>.
-     * <p>
-     * This is custom data that was previously set to the execute context using
-     * {@link #data(Object, Object)}. Use custom data if you want to pass data
-     * between events received by an {@link ExecuteListener}.
-     * <p>
-     * Unlike {@link Configuration#data()}, these data's lifecycle only
-     * matches that of a single query execution.
-     *
-     * @return The custom data. This is never <code>null</code>
-     * @see ExecuteListener
-     */
-    Map<Object, Object> data();
-
-    /**
-     * Get some custom data from this <code>ExecuteContext</code>.
-     * <p>
-     * This is custom data that was previously set to the execute context using
-     * {@link #data(Object, Object)}. Use custom data if you want to pass
-     * data between events received by an {@link ExecuteListener}.
-     * <p>
-     * Unlike {@link Configuration#data()}, these data's lifecycle only
-     * matches that of a single query execution.
-     *
-     * @param key A key to identify the custom data
-     * @return The custom data or <code>null</code> if no such data is contained
-     *         in this <code>ExecuteContext</code>
-     * @see ExecuteListener
-     */
-    Object data(Object key);
-
-    /**
-     * Set some custom data to this <code>ExecuteContext</code>.
-     * <p>
-     * This is custom data that was previously set to the execute context using
-     * {@link #data(Object, Object)}. Use custom data if you want to pass
-     * data between events received by an {@link ExecuteListener}.
-     * <p>
-     * Unlike {@link Configuration#data()}, these data's lifecycle only
-     * matches that of a single query execution.
-     *
-     * @param key A key to identify the custom data
-     * @param value The custom data
-     * @return The previously set custom data or <code>null</code> if no data
-     *         was previously set for the given key
-     * @see ExecuteListener
-     */
-    Object data(Object key, Object value);
-
     /**
      * The connection to be used in this execute context.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/RecordContext.java b/jOOQ/src/main/java/org/jooq/RecordContext.java
index 6be8b27054..32a0f7528e 100644
--- a/jOOQ/src/main/java/org/jooq/RecordContext.java
+++ b/jOOQ/src/main/java/org/jooq/RecordContext.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import java.util.Map;
 
 /**
  * A context object for {@link Record} manipulation passed to registered
@@ -50,56 +49,6 @@ import java.util.Map;
  */
 public interface RecordContext extends Scope {
 
-    /**
-     * Get all custom data from this <code>RecordContext</code>.
-     * <p>
-     * This is custom data that was previously set to the record context using
-     * {@link #data(Object, Object)}. Use custom data if you want to pass data
-     * between events received by a {@link RecordListener}.
-     * <p>
-     * Unlike {@link Configuration#data()}, these data's lifecycle only matches
-     * that of a single record manipulation.
-     *
-     * @return The custom data. This is never <code>null</code>
-     * @see RecordListener
-     */
-    Map<Object, Object> data();
-
-    /**
-     * Get some custom data from this <code>RecordContext</code>.
-     * <p>
-     * This is custom data that was previously set to the record context using
-     * {@link #data(Object, Object)}. Use custom data if you want to pass data
-     * between events received by an {@link RecordListener}.
-     * <p>
-     * Unlike {@link Configuration#data()}, these data's lifecycle only matches
-     * that of a single query execution.
-     *
-     * @param key A key to identify the custom data
-     * @return The custom data or <code>null</code> if no such data is contained
-     *         in this <code>RecordContext</code>
-     * @see RecordListener
-     */
-    Object data(Object key);
-
-    /**
-     * Set some custom data to this <code>RecordContext</code>.
-     * <p>
-     * This is custom data that was previously set to the record context using
-     * {@link #data(Object, Object)}. Use custom data if you want to pass data
-     * between events received by an {@link RecordListener}.
-     * <p>
-     * Unlike {@link Configuration#data()}, these data's lifecycle only matches
-     * that of a single query execution.
-     *
-     * @param key A key to identify the custom data
-     * @param value The custom data
-     * @return The previously set custom data or <code>null</code> if no data
-     *         was previously set for the given key
-     * @see RecordListener
-     */
-    Object data(Object key, Object value);
-
     /**
      * The type of database interaction that is being executed.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/VisitContext.java b/jOOQ/src/main/java/org/jooq/VisitContext.java
index 4c4f312375..bd55bf9216 100644
--- a/jOOQ/src/main/java/org/jooq/VisitContext.java
+++ b/jOOQ/src/main/java/org/jooq/VisitContext.java
@@ -40,7 +40,6 @@
  */
 package org.jooq;
 
-import java.util.Map;
 
 /**
  * A context object for {@link QueryPart} traversal passed to registered
@@ -51,44 +50,6 @@ import java.util.Map;
  */
 public interface VisitContext extends Scope {
 
-    /**
-     * Get all custom data from this <code>VisitContext</code>.
-     * <p>
-     * This corresponds to {@link Context#data()} returned from
-     * {@link #context()}.
-     *
-     * @return The custom data. This is never <code>null</code>
-     * @see VisitListener
-     */
-    Map<Object, Object> data();
-
-    /**
-     * Get some custom data from this <code>VisitContext</code>.
-     * <p>
-     * This corresponds to {@link Context#data(Object)} returned from
-     * {@link #context()}.
-     *
-     * @param key A key to identify the custom data
-     * @return The custom data or <code>null</code> if no such data is contained
-     *         in this <code>VisitListener</code>
-     * @see VisitListener
-     */
-    Object data(Object key);
-
-    /**
-     * Set some custom data to this <code>VisitContext</code>.
-     * <p>
-     * This corresponds to {@link Context#data(Object, Object)} returned from
-     * {@link #context()}.
-     *
-     * @param key A key to identify the custom data
-     * @param value The custom data
-     * @return The previously set custom data or <code>null</code> if no data
-     *         was previously set for the given key
-     * @see VisitContext
-     */
-    Object data(Object key, Object value);
-
     /**
      * The most recent clause that was encountered through
      * {@link Context#start(Clause)}.