Issue 53 delete enforcement