namespaces cleanup