More markup cleaning