Clean up dependencies a little