Clean up Token processing