cleaning up namespaces