Changed some on delete constraints to go along with changes