Getting rid of some unnecessary dependencies