Clean up token processing