Cleanup namespaces