Revert "upated"

This reverts commit c43e87e8f09393bf482fe7a4d1edef289a04f376.
Revert "index code cleanup"

This reverts commit 687a6fb8b58520bfd850c81c0ea97539637abb65.