Remove singleton from task scheduler (yay no more singletons!)