Don't allow double list insertion
Remove sockets from wait list before delivery