Cleaning dependencies up more