Clean up namespaces