Update deploy tasks, clean up