Slightly cleaned indexing and pruning