CleanUp waitlist logic