diff --git a/files/hive-site.xml b/files/hive-site.xml
index c4e271c..3b561a0 100644
--- a/files/hive-site.xml
+++ b/files/hive-site.xml
@@ -65,7 +65,7 @@
 
 <property>
   <name>hive.service.metrics.class</name>
-  <value>org.apache.hadoop.hive.common.metrics.metrics2.CodahaleMetrics</value>
+  <value>com.expediagroup.apiary.extensions.metastore.metrics.CodahaleMetrics</value>
 </property>
 
 <property>
diff --git a/files/startup.sh b/files/startup.sh
index ef474c9..2879374 100755
--- a/files/startup.sh
+++ b/files/startup.sh
@@ -100,13 +100,8 @@ if [ -n "$ENABLE_METRICS" ]; then
     if [ -n "$ECS_CONTAINER_METADATA_URI" ]; then
         echo "INSIDE - ECS_CONTAINER_METADATA_URI"
 
-        #export HIVE_METASTORE_HADOOP_OPTS="$HIVE_METASTORE_HADOOP_OPTS -Djava.net.preferIPv4Stack=true -javaagent:/usr/lib/apiary/jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar=8080:/etc/hive/conf/jmx-exporter.yaml"
         export EXPORTER_OPTS="-javaagent:/usr/lib/apiary/jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar=8080:/etc/hive/conf/jmx-exporter.yaml"
 
-        #echo "HIVE_METASTORE_HADOOP_OPTS and EXPORTER_OPTS set"
-        #echo $HIVE_METASTORE_HADOOP_OPTS
-        #echo $EXPORTER_OPTS
-        #echo "HIVE_METASTORE_HADOOP_OPTS and EXPORTER_OPTS set"
         export HADOOP_OPTS="$HADOOP_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9025 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -javaagent:/usr/lib/apiary/jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar=8080:/etc/hive/conf/jmx-exporter.yaml -Dcom.sun.management.jmxremote.ssl=false  $HEAP_OPTS"
 
         export CLOUDWATCH_NAMESPACE="${INSTANCE_NAME}-metastore"