Cleanup of auto-negotiation. Updated to 3 players