Removed unnecessary namespaces