Removal implemented #TODO