[#67] Update indexes

* Fix index column names
* Clean up unused function