Fix error with tokens and clear code