cleanup
rework for new namespace stubbing