Modified delete logic
Merge branch 'delete_report' into develop