Remove double wrapping with u