Remove hardcoded urls