CLeaned up some dependencies