Added cleanup option on hosts