Remove unecessary in RP client side