Had to modify to accomodate clean task on watch.