Jesse asked me to get rid of the getNonIndexedColumnsTableState method and use buildIndexedColumnScanner instead. Also, the kvs argument was never being used inside  buildIndexedColumnScanner. So removed it.