Cleanup + batch unit visibility