removed last bits of client