Clean up dependencies a bit