Cleaning up some dependencies