Remove property validation on delete
Merge branch 'dev_mclark'