Got rid of some dependencies