Remove unused code. Dry up generator slightly.