Cleanups of RX/TX calculations