Generator/GEMM : Further cleaning