Multi host support and cleanup