Clean up some api tokens for other services
Make search more game-aware