Remove hidden player set and merge dupe fix