Fix possible memory leak - remove the need for HashMaps of Player objects