Removing hardcoded urls