Macros edited to remove some Namespaces