Got rid of redundant ids, replaced with token ids