Clean up indexing