Restoring missing functionality from TransferManager.
Cleanup.