Namespaces cleanup