Reworking deletion.