Moved over to using Monit, cleaned a lot of things up