Remove wacky offbeat markup
More markup fixes