next stage and remove java files before codegen