Updates to remove unused playerIDs
Updates to merge clients/main.js manually