#410 Artifact cleanup extension

Need to run some perf test around this, with a lot of data. Realistic data.