combine namespaces into one
cleanup