Better DELETE handling