Removing superfluous closing spans

#### Summary ####
We've been closing them twice. Don't do that anymore.

#### Test Plan ####
Opened up the source in Firefox before and after. No invalid Markup is being highlighted anymore :)