clean up redundant namespaces

evaluate whether clarity decreases