Delete by ID

Deleting was sometimes fucking up, so now we delete by ID, which should be more robust.