And then eliminate the extra classes in the template.