Remove bad code, add better matchmaking