cleaned up rx_data object and client handling