Remove unnessary namespaces