Remove hard-coded urls