remove rdx, rename rdx2 to rdx