removed dependency on Token.h up