Tokenizer options

Removed outdated code from old implementation, updated tokenizer to have a simple option