Remove unused function, fix scaling rho -> rho/2 and remove variable rho stuff