Add clean task while Watching
Get ready for Foundation 4!