FEND-966: Display Merops tables as XHTML tables-removing commented out code