similar change on client side + cleanup