remove "client" variable