Namespaces cleaned up