Cleaning up dependencies and suchlike