Clean-up of tasks, and added rsync task