Better clean up
Fix monit script