Move deletes into separate calls