Updating how watch files are managed
Ensuring clean is run before other build steps and tasks return appropriately