Resolved the issue with cascading on delete