Remove IExTokenMissingError and clean up the code