Get rid of some depends