More 1.6 markup removal