Get rid of a bunch of unneeded dependencies