removed code from Generator