Remove remaining hard-coded urls