remove unnessary namespacing