Not waiting for client anymore