CONNECT-157 Tidy up startup scripts