Reworked scheduler... again
Removed junk files...