DELETE support. Cleanup