REmoving some text macros fromthe XMl that only increased complexity in our use case.