reworking, mostly deletes