Remove stupid hacks that are unneeded because of select() magic