BZ-12025 step-2-12 markup cleanup