trying to clean up token field