remove rho from more places