Tidy up package dependencies