Discard waiting tweaks; player waiting view updates
Removed unnecessary assertion