Clean up old markup more.