Simplify for sugar-web changes