MDL-31989: Added indexing stats + cleanup