Remove support for namespacing (issue 6234)