fix client remove