clean up player state organization