removed some cascade from db and updated checklist
removed checklist for merging
new checklist