Rationalised setup scripts