remove unneeded WHO request, and a little fix due to previous commit