trimming more old code, to start with generator