Get rid of unneeded scheduling