Properly clean up transfer requests

Change-Id: I6697c502875f281f0174a46a725d29fadb73c754
2 files changed