Get rid of some dependencies