Got rid of some dependencies? Maybe