Prepare for HBase index
HBaseStorage code clean up.