remove Client code