move ping/pong checks back into client