#410 Artifact cleanup extension

Yes it is extension version, I will make necessary changes.