Fixed Removing clients