removed data channels from these classes