HBase code clean ups

* trying to get tests to pass on travis.