Fix single generator cleanup