Fix version index
Index cleanup