Removed dead code
Got rid of 'using namespace ZZZ;' in header files