Remove generator to unify project