Removing leavers off schedules, formula calculation reports, etc at the end of the year

Removing leavers off schedules, formula calculation reports, etc at the end of the year

Can the system please be adjusted so that learners who leave the school do not appear on any reports at the end of the year, unless we choose 'left learners' or 'all learners' instead of current learners. 
To see the name of a learner who left, is one thing but learners who passed away during the year are also on all end-of-year calculations in d6+. They DO NOT appear on any lists in SA-SAMS as they are in the archives