Removal of client implemented