cleanup(generator): eliminate dead code, warnings.