Split out clean function into it's own task