I can trim down a bunch of athletes in a hurry.
Eliminate - BMX Racing and BMX Freestyle, 3x3Basketball, Sport Climbing, Flag Football, Trampoline, Golf and Skateboarding.
That should be enough spots for full weight classes. These events should have never been in the Olympics.