Client Remove functionality removed