Remove statics from TaskService