Namespaces clean-up
Save current macro