Cleanup after the namespace discovery rework

Cleanup after the namespace discovery rework #902