Remove unused code
Use wordKind in Lemma
Correct encoding