removed normalization of tokens