removed some using namespace from headers