Only a test case was calling this method.  So all the removals that use namespacecontext don't affect production code.