diff --git a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlDialect.java b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlDialect.java
index 9cc94415d9..e1b094880c 100644
--- a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlDialect.java
+++ b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlDialect.java
@@ -18,15 +18,12 @@
 
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.Set;
 import java.util.regex.Pattern;
 import lombok.NonNull;
 import lombok.Value;
@@ -51,7 +48,6 @@
 import org.polypheny.db.algebra.type.AlgDataTypeSystemImpl;
 import org.polypheny.db.languages.OperatorRegistry;
 import org.polypheny.db.languages.ParserPos;
-import org.polypheny.db.nodes.Operator;
 import org.polypheny.db.nodes.TimeUnitRange;
 import org.polypheny.db.sql.language.dialect.JethroDataSqlDialect;
 import org.polypheny.db.sql.language.dialect.JethroDataSqlDialect.JethroInfo;
@@ -84,60 +80,6 @@ public class SqlDialect {
      */
     public static final Context EMPTY_CONTEXT = emptyContext();
 
-    /**
-     * Built-in scalar functions and operators common for every dialect.
-     */
-    protected static final Set<Operator> BUILT_IN_OPERATORS_LIST =
-            ImmutableSet.<Operator>builder()
-                    .add( OperatorRegistry.get( OperatorName.ABS ) )
-                    .add( OperatorRegistry.get( OperatorName.ACOS ) )
-                    .add( OperatorRegistry.get( OperatorName.AND ) )
-                    .add( OperatorRegistry.get( OperatorName.ASIN ) )
-                    .add( OperatorRegistry.get( OperatorName.BETWEEN ) )
-                    .add( OperatorRegistry.get( OperatorName.CASE ) )
-                    .add( OperatorRegistry.get( OperatorName.CAST ) )
-                    .add( OperatorRegistry.get( OperatorName.CEIL ) )
-                    .add( OperatorRegistry.get( OperatorName.CHAR_LENGTH ) )
-                    .add( OperatorRegistry.get( OperatorName.CHARACTER_LENGTH ) )
-                    .add( OperatorRegistry.get( OperatorName.COALESCE ) )
-                    .add( OperatorRegistry.get( OperatorName.CONCAT ) )
-                    .add( OperatorRegistry.get( OperatorName.COS ) )
-                    .add( OperatorRegistry.get( OperatorName.COT ) )
-                    .add( OperatorRegistry.get( OperatorName.DIVIDE ) )
-                    .add( OperatorRegistry.get( OperatorName.EQUALS ) )
-                    .add( OperatorRegistry.get( OperatorName.FLOOR ) )
-                    .add( OperatorRegistry.get( OperatorName.GREATER_THAN ) )
-                    .add( OperatorRegistry.get( OperatorName.GREATER_THAN_OR_EQUAL ) )
-                    .add( OperatorRegistry.get( OperatorName.IN ) )
-                    .add( OperatorRegistry.get( OperatorName.IS_NOT_NULL ) )
-                    .add( OperatorRegistry.get( OperatorName.IS_NULL ) )
-                    .add( OperatorRegistry.get( OperatorName.LESS_THAN ) )
-                    .add( OperatorRegistry.get( OperatorName.LESS_THAN_OR_EQUAL ) )
-                    .add( OperatorRegistry.get( OperatorName.LIKE ) )
-                    .add( OperatorRegistry.get( OperatorName.LN ) )
-                    .add( OperatorRegistry.get( OperatorName.LOG10 ) )
-                    .add( OperatorRegistry.get( OperatorName.MINUS ) )
-                    .add( OperatorRegistry.get( OperatorName.MOD ) )
-                    .add( OperatorRegistry.get( OperatorName.MULTIPLY ) )
-                    .add( OperatorRegistry.get( OperatorName.NOT ) )
-                    .add( OperatorRegistry.get( OperatorName.NOT_BETWEEN ) )
-                    .add( OperatorRegistry.get( OperatorName.NOT_EQUALS ) )
-                    .add( OperatorRegistry.get( OperatorName.NOT_IN ) )
-                    .add( OperatorRegistry.get( OperatorName.NOT_LIKE ) )
-                    .add( OperatorRegistry.get( OperatorName.OR ) )
-                    .add( OperatorRegistry.get( OperatorName.PI ) )
-                    .add( OperatorRegistry.get( OperatorName.PLUS ) )
-                    .add( OperatorRegistry.get( OperatorName.POWER ) )
-                    .add( OperatorRegistry.get( OperatorName.RAND ) )
-                    .add( OperatorRegistry.get( OperatorName.ROUND ) )
-                    .add( OperatorRegistry.get( OperatorName.ROW ) )
-                    .add( OperatorRegistry.get( OperatorName.SIN ) )
-                    .add( OperatorRegistry.get( OperatorName.SQRT ) )
-                    .add( OperatorRegistry.get( OperatorName.SUBSTRING ) )
-                    .add( OperatorRegistry.get( OperatorName.TAN ) )
-                    .build();
-
-
     @NonNull
     String name;
 
@@ -749,7 +691,7 @@ public boolean supportsPostGIS() {
 
 
     public List<OperatorName> supportedGeoFunctions() {
-        return ImmutableList.of();
+        return List.of();
     }