[SG] - Added a clean up task