cleanup multi namespacing