removed more namespaces