more generated code removing