Clean up from move of some functionality to the send_file repo.