removed unnecessary namespaces