Remove duplicate unset()
fixing conflicts.