removed connections to old indexes, some comments