More cleanups, game is not a singleton anymore.