Added cleanup scheduler, last core piece before module conversion