Cleanup of FTP channel classes and DataDistribution classes