BZ-12025 Markup clean up