Removing references to strdup