Removed unneeded namespaces