Tidy up package use