Remove unneeded namespacing.