Remove useless code, fix a segfault in baywatch, timeout can be short for ping