Removed some boiler from generator