Removing waiting list code

This is a big PR that removes a ton of code.

@josephwegner, @landakram, @lolux I would appreciate a go of testing, if you have a moment.