Tidy up provision of external dependencies