Cleanup client.cpp

Pretty minor, some more cleanup could be done if we could drop the OE 3.2 compatibility.