[CLEANUP] More code cleanup for last notifications