diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a205fd53d2..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-*/target
-*/dependency-reduced-pom.xml
-*/*.xml.unformatted
-.idea/
-/target/
-*/*.iml
-.classpath
-.factorypath
-.project
-*/.settings/
-*/.DS_Store
-.settings/org.eclipse.m2e.core.prefs
-.vscode/settings.json
-*/packaged.yaml
-.DS_Store
-*/.jqwik-database
-dist
-node_modules
-package-lock.json
-cdk.out
-.env
diff --git a/athena-cloudera-hive/pom.xml b/athena-cloudera-hive/pom.xml
index 74ccc7b890..98e2f486b5 100644
--- a/athena-cloudera-hive/pom.xml
+++ b/athena-cloudera-hive/pom.xml
@@ -23,11 +23,6 @@
             <artifactId>athena-jdbc</artifactId>
             <version>2022.47.1</version>
         </dependency>
-        <dependency>
-            <groupId>Hive</groupId>
-            <artifactId>HiveJDBC42</artifactId>
-            <version>${clouderaVersion}</version>
-        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>athena-jdbc</artifactId>
diff --git a/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaFederationExpressionParser.java b/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaFederationExpressionParser.java
index 74469e70fb..3abc39655e 100644
--- a/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaFederationExpressionParser.java
+++ b/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaFederationExpressionParser.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package com.amazonaws.athena.connectors.hortonworks;
+package com.amazonaws.athena.connectors.cloudera;
 
 import com.amazonaws.athena.connectors.jdbc.manager.JdbcFederationExpressionParser;
 import com.google.common.base.Joiner;
diff --git a/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandler.java b/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandler.java
index 46c2cf494a..4501a0bcc6 100644
--- a/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandler.java
+++ b/athena-cloudera-impala/src/main/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandler.java
@@ -22,7 +22,6 @@
 import com.amazonaws.athena.connector.lambda.domain.Split;
 import com.amazonaws.athena.connector.lambda.domain.TableName;
 import com.amazonaws.athena.connector.lambda.domain.predicate.Constraints;
-import com.amazonaws.athena.connectors.hortonworks.ImpalaFederationExpressionParser;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionConfig;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionInfo;
 import com.amazonaws.athena.connectors.jdbc.connection.JdbcConnectionFactory;
diff --git a/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaQueryStringBuilderTest.java b/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaQueryStringBuilderTest.java
index d87cc871c6..0b08ecfe45 100644
--- a/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaQueryStringBuilderTest.java
+++ b/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaQueryStringBuilderTest.java
@@ -20,7 +20,6 @@
 package com.amazonaws.athena.connectors.cloudera;
 
 import com.amazonaws.athena.connector.lambda.domain.Split;
-import com.amazonaws.athena.connectors.hortonworks.ImpalaFederationExpressionParser;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandlerTest.java b/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandlerTest.java
index bff0d77a30..c3eb630afd 100644
--- a/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandlerTest.java
+++ b/athena-cloudera-impala/src/test/java/com/amazonaws/athena/connectors/cloudera/ImpalaRecordHandlerTest.java
@@ -28,7 +28,6 @@
 import com.amazonaws.athena.connector.lambda.domain.predicate.Range;
 import com.amazonaws.athena.connector.lambda.domain.predicate.SortedRangeSet;
 import com.amazonaws.athena.connector.lambda.domain.predicate.ValueSet;
-import com.amazonaws.athena.connectors.hortonworks.ImpalaFederationExpressionParser;
 import com.amazonaws.athena.connectors.jdbc.connection.DatabaseConnectionConfig;
 import com.amazonaws.athena.connectors.jdbc.connection.JdbcConnectionFactory;
 import com.amazonaws.athena.connectors.jdbc.connection.JdbcCredentialProvider;
diff --git a/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/lambda/data/S3BlockSpiller.java b/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/lambda/data/S3BlockSpiller.java
index 502453ed0b..1e663478fa 100644
--- a/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/lambda/data/S3BlockSpiller.java
+++ b/athena-federation-sdk/src/main/java/com/amazonaws/athena/connector/lambda/data/S3BlockSpiller.java
@@ -362,6 +362,7 @@ protected SpillLocation write(Block block)
             // only sees the InputStream wrapper.
             ObjectMetadata objMeta = new ObjectMetadata();
             objMeta.setContentLength(bytes.length);
+            objMeta.setSSEAlgorithm(ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);
             PutObjectRequest request = new PutObjectRequest(
                     spillLocation.getBucket(),
                     spillLocation.getKey(),
diff --git a/athena-sqlserver/src/main/java/com/amazonaws/athena/connectors/sqlserver/SqlServerMetadataHandler.java b/athena-sqlserver/src/main/java/com/amazonaws/athena/connectors/sqlserver/SqlServerMetadataHandler.java
index e4be05ff33..542bd268e7 100644
--- a/athena-sqlserver/src/main/java/com/amazonaws/athena/connectors/sqlserver/SqlServerMetadataHandler.java
+++ b/athena-sqlserver/src/main/java/com/amazonaws/athena/connectors/sqlserver/SqlServerMetadataHandler.java
@@ -499,7 +499,7 @@ private Set<String> listDatabaseNames(final Connection jdbcConnection)
     {
         String queryToListUserCreatedSchemas = "select s.name as schema_name from " +
                 "sys.schemas s inner join sys.sysusers u on u.uid = s.principal_id " +
-                "where u.issqluser = 1 " +
+                "where (u.issqluser = 1 or u.isntuser =1 ) " +
                 "and u.name not in ('sys', 'guest', 'INFORMATION_SCHEMA') " +
                 "order by s.name";
         try (Statement st = jdbcConnection.createStatement();