diff --git a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
index 29a5abdab..4b935474f 100644
--- a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
+++ b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
@@ -45,12 +45,6 @@ public interface ExpressionPath {
    */
   Object parseDateTime(long systemTimeMillis);
 
-  /**
-   * Return true if the last type is "DateTime capable" - can support
-   * {@link #parseDateTime(long)}.
-   */
-  boolean isDateTimeCapable();
-
   /**
    * Return the underlying JDBC type or 0 if this is not a scalar type.
    */
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index af3e73493..6de4b8cd3 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -163,20 +163,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    */
   DocPropertyType getDocType();
 
-  /**
-   * Return true if the type can accept long systemTimeMillis input.
-   * <p>
-   * This is used to determine if it is sensible to use the
-   * {@link #convertFromMillis(long)} method.
-   * <p>
-   * This includes the Date, Calendar, sql Date, Time, Timestamp, JODA types
-   * as well as Long, BigDecimal and String (although it generally is not
-   * expected to parse systemTimeMillis to a String or BigDecimal).
-   */
-  default boolean isDateTimeCapable() {
-    return false;
-  }
-
   /**
    * Convert the value into a long version value.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index bd479b08d..fb02fdc74 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -180,11 +180,6 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     return prefix;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
   @Override
   public int jdbcType() {
     return 0;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 2133ef767..f04adf431 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -940,11 +940,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return scalarType;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return scalarType != null && scalarType.isDateTimeCapable();
-  }
-
   @Override
   public int jdbcType() {
     return scalarType == null ? 0 : scalarType.getJdbcType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index d10acaedc..9579bfc79 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -227,12 +227,6 @@ public final class ElPropertyChain implements ElPropertyValue {
     return lastBeanProperty;
   }
 
-
-  @Override
-  public boolean isDateTimeCapable() {
-    return scalarType != null && scalarType.isDateTimeCapable();
-  }
-
   @Override
   public int jdbcType() {
     return scalarType == null ? 0 : scalarType.getJdbcType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
index ddd309760..62be82d5c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
@@ -123,11 +123,7 @@ public class TCsvReader<T> implements CsvReader<T> {
 
   @Override
   public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) {
-
     ExpressionPath elProp = descriptor.expressionPath(propertyName);
-    if (!elProp.isDateTimeCapable()) {
-      throw new TextException("Property " + propertyName + " is not DateTime capable");
-    }
     if (dateTimeFormat == null) {
       dateTimeFormat = getDefaultDateTimeFormat(elProp.jdbcType());
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index 4e55d34de..a736f6bcd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -82,11 +82,6 @@ abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
     return convertFromDate(ts);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public T jsonRead(JsonParser parser) throws IOException {
     if (JsonToken.VALUE_NUMBER_INT == parser.getCurrentToken()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index aa1670df7..cd97fc731 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -160,11 +160,6 @@ abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
     }
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public T readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 0a3e98b6c..815d5e193 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -62,11 +62,6 @@ class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
     return BigDecimal.valueOf(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public BigDecimal readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index ec753b307..301f5e2ae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -52,11 +52,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
     return byte[].class;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return baseType.isDateTimeCapable();
-  }
-
   @Override
   public boolean isJdbcNative() {
     return baseType.isJdbcNative();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 5877c5d4a..392cb3bdb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -61,11 +61,6 @@ final class ScalarTypeDouble extends ScalarTypeBase<Double> {
     return (double) systemTimeMillis;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Double readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index 392fc1b86..e05c674a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -94,11 +94,6 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
     return wrapped.getType();
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return wrapped.isDateTimeCapable();
-  }
-
   @Override
   public boolean isJdbcNative() {
     return false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index fd13f2082..66f2d206b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -61,11 +61,6 @@ final class ScalarTypeFloat extends ScalarTypeBase<Float> {
     return (float) systemTimeMillis;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Float readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 0e1ef6075..164646899 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -91,11 +91,6 @@ final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
     throw new TextException("Not Supported");
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
   @Override
   public Integer jsonRead(JsonParser parser) throws IOException {
     return parser.getIntValue();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index 785069345..b9e434773 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -77,11 +77,6 @@ class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
     return new LocalTime(systemTimeMillis, DateTimeZone.getDefault());
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public LocalTime readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index f851bdcfa..b859b56c6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -86,11 +86,6 @@ class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
     return LocalTime.parse(value);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
   @Override
   public LocalTime convertFromMillis(long systemTimeMillis) {
     throw new TextException("Not Supported");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 3409cc9ed..cb9427967 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -71,11 +71,6 @@ final class ScalarTypeLong extends ScalarTypeBase<Long> {
     return systemTimeMillis;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Long readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index aa6d7d4b5..b6855e4ad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -66,11 +66,6 @@ final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
     return BigInteger.valueOf(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public BigInteger readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index d0ea5a278..6878fbb5b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -61,11 +61,6 @@ abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
     return String.valueOf(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public String readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index 8328edfbe..e8bcca79d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -62,11 +62,6 @@ final class ScalarTypeTime extends ScalarTypeBase<Time> {
     return new Time(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Time readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index f0e83bed3..e83611f77 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -99,11 +99,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
     return wrapperType;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return scalarType.isDateTimeCapable();
-  }
-
   @Override
   public boolean isJdbcNative() {
     return false;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
index 1a8fb3218..99c1606c2 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
@@ -75,11 +75,6 @@ class ScalarTypeDurationTest {
     assertEquals(Duration.ofSeconds(1234), duration);
   }
 
-  @Test
-  void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   void testConvertFromMillis() {
     assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
index aca406df5..205dac263 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
@@ -75,11 +75,6 @@ class ScalarTypeDurationWithNanosTest {
     assertEquals(duration, val1);
   }
 
-  @Test
-  void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   void testConvertFromMillis() {
     assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
index c40950842..7c554b810 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
@@ -11,7 +11,8 @@ import java.sql.Timestamp;
 import java.time.Instant;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ScalarTypeInstantTest {
 
@@ -107,12 +108,6 @@ public class ScalarTypeInstantTest {
     assertEquals(now, val1);
   }
 
-  @Test
-  public void testIsDateTimeCapable() throws Exception {
-
-    assertTrue(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() throws Exception {
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
index e98cdef0f..4bc5c3f63 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
@@ -77,11 +77,6 @@ public class ScalarTypeLocalTimeTest {
     assertEquals(localTime, val1);
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() {
     assertThrows(TextException.class, () -> type.convertFromMillis(1234));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
index 6e2e24057..36bf79d9f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
@@ -74,11 +74,6 @@ public class ScalarTypeLocalTimeWithNanosTest {
     assertEquals(localTime, val1);
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() {
     assertThrows(TextException.class, () -> type.convertFromMillis(1234));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
index efe128b91..05a1b20aa 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
@@ -6,7 +6,8 @@ import java.sql.Date;
 import java.time.LocalDate;
 import java.time.MonthDay;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ScalarTypeMonthDayTest {
 
@@ -48,11 +49,6 @@ public class ScalarTypeMonthDayTest {
     assertEquals(value, monthDay);
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() {
     assertThrows(RuntimeException.class, () -> type.convertFromMillis(1203));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
index 382cd1db0..1a6a4afd0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
@@ -26,11 +26,6 @@ public class ScalarTypePostgresHstoreTest {
     assertTrue(hstore.isMutable());
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(hstore.isDateTimeCapable());
-  }
-
   @Test
   public void testIsDirty() {
     Map<String, Object> emptyMap = new HashMap<>();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
index 9a0440b67..ec3252a33 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.text.TextException;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
@@ -71,11 +70,6 @@ class ScalarTypeYearTest {
     assertEquals(Year.of(2013), year);
   }
 
-  @Test
-  void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   void testConvertFromMillis() {
     assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));