Namespaces cleaned up.