#410 Artifact cleanup extension

There are a few other mocks higher up in this method. This can be moved to be with them.