[Client] Tiny cleaning