wokring on CodeGen and removed Codegen