Remove namespaces for redability