Cleanup of namespaces