Removed more using namespace statements.