Remove unneeded old indexing code