Engine cleanup, generation interface change