diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java
index 2bda39be87..7c2a39be0a 100644
--- a/src/main/java/org/spongepowered/api/data/Keys.java
+++ b/src/main/java/org/spongepowered/api/data/Keys.java
@@ -1408,16 +1408,6 @@ public final class Keys {
      */
     public static final Key<Value<Tag<BlockType>>> INFINIBURN = Keys.key(ResourceKey.sponge("infiniburn"), new TypeToken<Tag<BlockType>>() {});
 
-    /**
-     * Whether an {@link Item} will not despawn for an infinite time.
-     */
-    public static final Key<Value<Boolean>> INFINITE_DESPAWN_DELAY = Keys.key(ResourceKey.sponge("infinite_despawn_delay"), Boolean.class);
-
-    /**
-     * Whether an {@link Item} has an infinite pickup delay.
-     */
-    public static final Key<Value<Boolean>> INFINITE_PICKUP_DELAY = Keys.key(ResourceKey.sponge("infinite_pickup_delay"), Boolean.class);
-
     /**
      * Whether a world of a {@link ServerWorldProperties} was initialized.
      */
@@ -2087,8 +2077,7 @@ public final class Keys {
      * <p>When this value hits 0 or lower, the Vex will receive damage and
      * then the value will set back to 20 until the Vex dies.</p>
      *
-     * <p>If the Vex was summoned by a player, this value will be pegged at 0
-     * and the Vex will not take any damage.</p>
+     * <p>If the Vex was summoned by a player, this value will be {@link Ticks#infinite()}</p>
      */
     public static final Key<Value<Ticks>> LIFE_TICKS = Keys.key(ResourceKey.sponge("life_ticks"), Ticks.class);
 
diff --git a/src/main/java/org/spongepowered/api/entity/Item.java b/src/main/java/org/spongepowered/api/entity/Item.java
index 0954f1b523..e159ce697d 100644
--- a/src/main/java/org/spongepowered/api/entity/Item.java
+++ b/src/main/java/org/spongepowered/api/entity/Item.java
@@ -52,24 +52,6 @@ default Value.Mutable<Ticks> despawnDelay() {
         return this.requireValue(Keys.DESPAWN_DELAY).asMutable();
     }
 
-    /**
-     * {@link Keys#INFINITE_DESPAWN_DELAY}
-     *
-     * @return Whether the item will not despawn for an infinite time
-     */
-    default Value.Mutable<Boolean> infiniteDespawnDelay() {
-        return this.requireValue(Keys.INFINITE_DESPAWN_DELAY).asMutable();
-    }
-
-    /**
-     * {@link Keys#INFINITE_PICKUP_DELAY}
-     *
-     * @return Whether the item has an infinite pickup delay
-     */
-    default Value.Mutable<Boolean> infinitePickupDelay() {
-        return this.requireValue(Keys.INFINITE_PICKUP_DELAY).asMutable();
-    }
-
     /**
      * {@link Keys#PICKUP_DELAY}
      *
diff --git a/src/main/java/org/spongepowered/api/util/Ticks.java b/src/main/java/org/spongepowered/api/util/Ticks.java
index 3a204bf053..a0f8634c90 100644
--- a/src/main/java/org/spongepowered/api/util/Ticks.java
+++ b/src/main/java/org/spongepowered/api/util/Ticks.java
@@ -304,7 +304,7 @@ static Ticks ofMinecraftDays(final Engine engine, final long days) {
      *
      * @param engine The {@link Engine} to get the {@link Duration} for
      * @return The effective {@link Duration}.
-     * @throws IllegalStateException If {@see isInfinite} is true.
+     * @throws IllegalStateException If {@link Ticks#isInfinite()} is true.
      */
     Duration expectedDuration(final Engine engine);
 
@@ -316,7 +316,7 @@ static Ticks ofMinecraftDays(final Engine engine, final long days) {
      * session.</p>
      *
      * @return The number of ticks that this represents.
-     * @throws IllegalStateException If {@see isInfinite} is true.
+     * @throws IllegalStateException If {@link Ticks#isInfinite()} is true.
      */
     long ticks();
 
@@ -332,7 +332,7 @@ static Ticks ofMinecraftDays(final Engine engine, final long days) {
      *
      * @param engine The {@link Engine} to calculate the duration for.
      * @return The approximate number of in-game seconds
-     * @throws IllegalStateException If {@see isInfinite} is true.
+     * @throws IllegalStateException If {@link Ticks#isInfinite()} is true.
      */
     long minecraftSeconds(final Engine engine);
 
@@ -345,7 +345,7 @@ static Ticks ofMinecraftDays(final Engine engine, final long days) {
      *
      * @param engine The {@link Engine} to calculate the duration for.
      * @return A duration representing the in game time.
-     * @throws IllegalStateException If {@see isInfinite} is true.
+     * @throws IllegalStateException If {@link Ticks#isInfinite()} is true.
      */
     Duration minecraftDayTimeDuration(final Engine engine);