Get rid of unnecessary dependencies