Additional cleanups of unused code and correctly hookup HBaseClient shutdown