Removed unnecesary namespaces