Namespaces cleanup.