Fixed scheduler & delete directory