Remove more stale markup