Tidy up and using monit on all installs