diff --git a/community/values/src/main/java/org/neo4j/values/storable/ByteValue.java b/community/values/src/main/java/org/neo4j/values/storable/ByteValue.java
index 189f8b0d1a85f..084f1e68fd350 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/ByteValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/ByteValue.java
@@ -20,7 +20,6 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.utils.ValueMath;
 
 import static java.lang.String.format;
 
@@ -77,112 +76,4 @@ public <T> T map( ValueMapper<T> mapper )
     {
         return mapper.mapByte( this );
     }
-
-    @Override
-    public NumberValue minus( byte b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( short b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( int b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( long b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( float b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( double b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue plus( byte b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( short b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( int b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( long b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( float b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( double b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue times( byte b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( short b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( int b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( long b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( float b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( double b )
-    {
-        return ValueMath.multiply( value, b );
-    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/DoubleValue.java b/community/values/src/main/java/org/neo4j/values/storable/DoubleValue.java
index 2c2cda026d6b2..5a672ab830699 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/DoubleValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/DoubleValue.java
@@ -20,7 +20,6 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.utils.ValueMath;
 
 import static java.lang.String.format;
 
@@ -73,112 +72,4 @@ public <T> T map( ValueMapper<T> mapper )
     {
         return mapper.mapDouble( this );
     }
-
-    @Override
-    public NumberValue minus( byte b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( short b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( int b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( long b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( float b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( double b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue plus( byte b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( short b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( int b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( long b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( float b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( double b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue times( byte b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( short b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( int b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( long b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( float b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( double b )
-    {
-        return ValueMath.multiply( value, b );
-    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/FloatValue.java b/community/values/src/main/java/org/neo4j/values/storable/FloatValue.java
index 94970c52399ee..060938c3ca22b 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/FloatValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/FloatValue.java
@@ -20,7 +20,6 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.utils.ValueMath;
 
 import static java.lang.String.format;
 
@@ -73,112 +72,4 @@ public <T> T map( ValueMapper<T> mapper )
     {
         return mapper.mapFloat( this );
     }
-
-    @Override
-    public NumberValue minus( byte b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( short b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( int b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( long b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( float b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( double b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue plus( byte b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( short b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( int b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( long b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( float b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( double b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue times( byte b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( short b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( int b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( long b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( float b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( double b )
-    {
-        return ValueMath.multiply( value, b );
-    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/FloatingPointValue.java b/community/values/src/main/java/org/neo4j/values/storable/FloatingPointValue.java
index bd646df594f33..b1f2cadcec254 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/FloatingPointValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/FloatingPointValue.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.values.storable;
 
+import org.neo4j.values.utils.ValueMath;
+
 public abstract class FloatingPointValue extends NumberValue
 {
     @Override
@@ -93,4 +95,40 @@ public long longValue()
     {
         return (long) doubleValue();
     }
+
+    @Override
+    public DoubleValue minus( long b )
+    {
+        return ValueMath.subtract( doubleValue(), b );
+    }
+
+    @Override
+    public DoubleValue minus( double b )
+    {
+        return ValueMath.subtract( doubleValue(), b );
+    }
+
+    @Override
+    public DoubleValue plus( long b )
+    {
+        return ValueMath.add( doubleValue(), b );
+    }
+
+    @Override
+    public DoubleValue plus( double b )
+    {
+        return ValueMath.add( doubleValue(), b );
+    }
+
+    @Override
+    public DoubleValue times( long b )
+    {
+        return ValueMath.multiply( doubleValue(), b );
+    }
+
+    @Override
+    public DoubleValue times( double b )
+    {
+        return ValueMath.multiply( doubleValue(), b );
+    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/IntValue.java b/community/values/src/main/java/org/neo4j/values/storable/IntValue.java
index 1a9599f030a0b..1d7985c40c4e4 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/IntValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/IntValue.java
@@ -20,7 +20,6 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.utils.ValueMath;
 
 import static java.lang.String.format;
 
@@ -73,111 +72,4 @@ public <T> T map( ValueMapper<T> mapper )
     {
         return mapper.mapInt( this );
     }
-
-    @Override
-    public NumberValue minus( byte b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( short b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( int b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( long b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( float b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( double b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue plus( byte b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( short b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( int b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( long b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( float b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( double b )
-    {
-        return ValueMath.add( value, b );
-    }
-    @Override
-    public NumberValue times( byte b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( short b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( int b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( long b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( float b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( double b )
-    {
-        return ValueMath.multiply( value, b );
-    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/IntegralValue.java b/community/values/src/main/java/org/neo4j/values/storable/IntegralValue.java
index 47b520cc5c4e7..b5a883bfa2ca8 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/IntegralValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/IntegralValue.java
@@ -20,6 +20,7 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.utils.ValueMath;
 
 public abstract class IntegralValue extends NumberValue
 {
@@ -103,4 +104,40 @@ public double doubleValue()
     {
         return longValue();
     }
+
+    @Override
+    public LongValue minus( long b )
+    {
+        return ValueMath.subtract( longValue(), b );
+    }
+
+    @Override
+    public DoubleValue minus( double b )
+    {
+        return ValueMath.subtract( longValue(), b );
+    }
+
+    @Override
+    public LongValue plus( long b )
+    {
+        return ValueMath.add( longValue(), b );
+    }
+
+    @Override
+    public DoubleValue plus( double b )
+    {
+        return ValueMath.add( longValue(), b );
+    }
+
+    @Override
+    public LongValue times( long b )
+    {
+        return ValueMath.multiply( longValue(), b );
+    }
+
+    @Override
+    public DoubleValue times( double b )
+    {
+        return ValueMath.multiply( longValue(), b );
+    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/LongValue.java b/community/values/src/main/java/org/neo4j/values/storable/LongValue.java
index bc8d71467ff70..69f0570935f46 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/LongValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/LongValue.java
@@ -20,7 +20,6 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.utils.ValueMath;
 
 import static java.lang.String.format;
 
@@ -73,112 +72,4 @@ public <T> T map( ValueMapper<T> mapper )
     {
         return mapper.mapLong( this );
     }
-
-    @Override
-    public NumberValue minus( byte b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( short b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( int b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( long b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( float b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( double b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue plus( byte b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( short b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( int b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( long b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( float b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( double b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue times( byte b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( short b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( int b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( long b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( float b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( double b )
-    {
-        return ValueMath.multiply( value, b );
-    }
 }
diff --git a/community/values/src/main/java/org/neo4j/values/storable/NumberValue.java b/community/values/src/main/java/org/neo4j/values/storable/NumberValue.java
index 896d34bec5e05..1fa593eafafae 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/NumberValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/NumberValue.java
@@ -79,40 +79,16 @@ public ValueGroup valueGroup()
         return ValueGroup.NUMBER;
     }
 
-    public abstract NumberValue minus( byte b );
-
-    public abstract NumberValue minus( short b );
-
-    public abstract NumberValue minus( int b );
-
     public abstract NumberValue minus( long b );
 
-    public abstract NumberValue minus( float b );
-
     public abstract NumberValue minus( double b );
 
-    public abstract NumberValue plus( byte b );
-
-    public abstract NumberValue plus( short b );
-
-    public abstract NumberValue plus( int b );
-
     public abstract NumberValue plus( long b );
 
-    public abstract NumberValue plus( float b );
-
     public abstract NumberValue plus( double b );
 
-    public abstract NumberValue times( byte b );
-
-    public abstract NumberValue times( short b );
-
-    public abstract NumberValue times( int b );
-
     public abstract NumberValue times( long b );
 
-    public abstract NumberValue times( float b );
-
     public abstract NumberValue times( double b );
 
     public NumberValue minus( NumberValue numberValue )
diff --git a/community/values/src/main/java/org/neo4j/values/storable/ShortValue.java b/community/values/src/main/java/org/neo4j/values/storable/ShortValue.java
index 144f34367277e..9ac5727d361a8 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/ShortValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/ShortValue.java
@@ -20,7 +20,6 @@
 package org.neo4j.values.storable;
 
 import org.neo4j.values.ValueMapper;
-import org.neo4j.values.utils.ValueMath;
 
 import static java.lang.String.format;
 
@@ -77,112 +76,4 @@ public <T> T map( ValueMapper<T> mapper )
     {
         return mapper.mapShort( this );
     }
-
-    @Override
-    public NumberValue minus( byte b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( short b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( int b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( long b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( float b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue minus( double b )
-    {
-        return ValueMath.subtract( value, b );
-    }
-
-    @Override
-    public NumberValue plus( byte b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( short b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( int b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( long b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( float b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue plus( double b )
-    {
-        return ValueMath.add( value, b );
-    }
-
-    @Override
-    public NumberValue times( byte b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( short b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( int b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( long b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( float b )
-    {
-        return ValueMath.multiply( value, b );
-    }
-
-    @Override
-    public NumberValue times( double b )
-    {
-        return ValueMath.multiply( value, b );
-    }
 }