Tidy up install scripts