Switch from LinkedHashSet to HashMap for SNEntityCollection
Cleaned up SNPlayerCollection