Fixes remove_client method.