Cleanup to FileSender and P2P