BZ-12025 ecm mark-up clean up