diff --git a/README.md b/README.md
index f8ff3c02e..4e28dd3fc 100644
--- a/README.md
+++ b/README.md
@@ -186,4 +186,4 @@ Running the Virtual Schema requires a Java Runtime version 9 or later.
 [sap-hana-dialect-doc]: doc/dialects/saphana.md
 [sql-server-dialect-doc]: doc/dialects/sql_server.md
 [sybase-dialect-doc]: doc/dialects/sybase.md
-[teradata-dialect-doc]: doc/dialects/teradata.md
+[teradata-dialect-doc]: doc/dialects/teradata.md
\ No newline at end of file
diff --git a/doc/changes/changes_4.0.4.md b/doc/changes/changes_4.0.4.md
index 8217697d1..b99125e53 100644
--- a/doc/changes/changes_4.0.4.md
+++ b/doc/changes/changes_4.0.4.md
@@ -2,4 +2,15 @@
 
 ## Documentation
 
-#371: Documented data types conversion for Hive dialect.
\ No newline at end of file
+#371: Documented data types conversion for Hive dialect.
+
+## Refactoring
+
+#263: Removed SybaseMetadataReader class as it was not used by the dialect.
+
+<details>
+  <summary>Click to expand</summary>
+  
+* Updated `org.apache.hbase:hbase-server` from 2.3.0 to 2.3.1
+
+</details>
diff --git a/doc/user-guide/user_guide.md b/doc/user-guide/user_guide.md
index 4c239bf54..fffbc41ac 100644
--- a/doc/user-guide/user_guide.md
+++ b/doc/user-guide/user_guide.md
@@ -149,6 +149,6 @@ There are a few important things you need to know about those data types.
 
 See also:
 
-* [List of Supported Dialect](doc/user-guide/dialects.md)
-* [Virtual Schema's Properties Reference](doc/user-guide/virtual_schema_properties.md)
-* [SQL Client Specifics](doc/user-guide/sql_clients.md)
\ No newline at end of file
+* [List of Supported Dialect](dialects.md)
+* [Virtual Schema's Properties Reference](virtual_schema_properties.md)
+* [SQL Client Specifics](sql_clients.md)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dcbe78058..69c711e22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-server</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1</version>
             <scope>test</scope>
             <!--Excluding transient dependencies with vulnerabilities-->
             <exclusions>
diff --git a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java b/src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java
deleted file mode 100644
index 28a24dabe..000000000
--- a/src/main/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReader.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.exasol.adapter.dialects.sybase;
-
-import java.sql.Connection;
-
-import com.exasol.adapter.AdapterProperties;
-import com.exasol.adapter.dialects.BaseIdentifierConverter;
-import com.exasol.adapter.dialects.IdentifierConverter;
-import com.exasol.adapter.dialects.sqlserver.SqlServerColumnMetadataReader;
-import com.exasol.adapter.jdbc.*;
-
-/**
- * This class implements a Sybase-specific remote metadata reader
- */
-public class SybaseMetadataReader extends AbstractRemoteMetadataReader {
-    /**
-     * Create a new instance of a {@link SybaseMetadataReader}
-     *
-     * @param connection JDBC connection to the remote data source
-     * @param properties user-defined adapter properties
-     */
-    public SybaseMetadataReader(final Connection connection, final AdapterProperties properties) {
-        super(connection, properties);
-    }
-
-    /**
-     * Create a column metadata reader
-     * <p>
-     * Due to the close relationship between Sybase and SQLSever, we reuse the SQLServer column metadata reader
-     * here.
-     */
-    @Override
-    protected ColumnMetadataReader createColumnMetadataReader() {
-        return new SqlServerColumnMetadataReader(this.connection, this.properties, getIdentifierConverter());
-    }
-
-    @Override
-    protected TableMetadataReader createTableMetadataReader() {
-        return new BaseTableMetadataReader(this.connection, this.columnMetadataReader, this.properties,
-                this.identifierConverter);
-    }
-
-    @Override
-    protected IdentifierConverter createIdentifierConverter() {
-        return BaseIdentifierConverter.createDefault();
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java b/src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java
deleted file mode 100644
index f6282f019..000000000
--- a/src/test/java/com/exasol/adapter/dialects/sybase/SybaseMetadataReaderTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.exasol.adapter.dialects.sybase;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.exasol.adapter.AdapterProperties;
-import com.exasol.adapter.dialects.sqlserver.SqlServerColumnMetadataReader;
-import com.exasol.adapter.jdbc.BaseTableMetadataReader;
-import com.exasol.adapter.jdbc.RemoteMetadataReader;
-
-class SybaseMetadataReaderTest {
-    private RemoteMetadataReader reader;
-
-    @BeforeEach
-    void beforeEach() {
-        this.reader = new SybaseMetadataReader(null, AdapterProperties.emptyProperties());
-    }
-
-    @Test
-    void testGetTableMetadataReader() {
-        assertThat(this.reader.getTableMetadataReader(), instanceOf(BaseTableMetadataReader.class));
-    }
-
-    @Test
-    void testGetColumnMetadataReaderReusesSqlServerColumnMetadataReader() {
-        assertThat(this.reader.getColumnMetadataReader(), instanceOf(SqlServerColumnMetadataReader.class));
-    }
-}
\ No newline at end of file