Remove code related to handoff
Improve instructions for handoff
Handle more downloading failures