Remove unnecessary namespacing