diff --git hcatalog/bin/hive-config.sh hcatalog/bin/hive-config.sh
deleted file mode 100644
index 7cd0e2a..0000000
--- hcatalog/bin/hive-config.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# processes --config option from command line
-#
-
-this="$0"
-while [ -h "$this" ]; do
- ls=`ls -ld "$this"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- this="$link"
- else
- this=`dirname "$this"`/"$link"
- fi
-done
-
-# convert relative path to absolute path
-bin=`dirname "$this"`
-script=`basename "$this"`
-bin=`cd "$bin"; pwd`
-this="$bin/$script"
-
-# the root of the hcatalog-hive installation
-export HIVE_HOME=`dirname "$bin"`/share/hcatalog
-
-#check to see if the conf dir is given as an optional argument
-while [ $# -gt 0 ]; do # Until you run out of parameters . . .
- case "$1" in
- --config)
- shift
- confdir=$1
- shift
- HIVE_CONF_DIR=$confdir
- ;;
- --auxpath)
- shift
- HIVE_AUX_JARS_PATH=$1
- shift
- ;;
- *)
- break;
- ;;
- esac
-done
-
-#check if /etc/hcatalog/hcat-env.sh file exists in case of rpm installs
-if [ -f "/etc/hcatalog/hcat-env.sh" ]; then
- DEFAULT_CONF_DIR="/etc/hcatalog"
-else
- #assume that conf is in HIVE_HOME
- DEFAULT_CONF_DIR="${HIVE_HOME}/conf"
-fi
-
-# Allow alternate conf dir location.
-HIVE_CONF_DIR="${HIVE_CONF_DIR:-$DEFAULT_CONF_DIR}"
-
-export HIVE_CONF_DIR=$HIVE_CONF_DIR
-export HIVE_AUX_JARS_PATH=$HIVE_AUX_JARS_PATH
-
-# Default to use 256MB
-export HADOOP_HEAPSIZE=${HADOOP_HEAPSIZE:-256}
diff --git hcatalog/webhcat/svr/src/main/config/webhcat-default.xml hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
index c9af3b6..941c2e2 100644
--- hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
+++ hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
@@ -38,12 +38,6 @@
- templeton.jar
- ${env.TEMPLETON_HOME}/share/webhcat/svr/webhcat-0.6.0-SNAPSHOT.jar
- The path to the Templeton jar file.
-
-
-
templeton.libjars
${env.TEMPLETON_HOME}/share/webhcat/svr/lib/zookeeper-3.4.3.jar
Jars to add to the classpath.