Cleanup and working toward redoing the game comms