Remove some global 'using namespace's
Remove some more global using namespaces