Cleanup: range indexing