Clean up the replicate task a little more and also the object set