Startup gcode without 2nd prime line

I made startup Gcode without 2nd prime wipe line, but im improve and move it to front and make possible better cleaning, specially after flow test when nozzle little bit leaks out filament. I tested its for x1c with ams, but i guess also p1p and p1s will works becomes its not too much difference. Only for p1p and p1s need change last lines in startup gcode, not all code, see last photo, disable last lines with “ ; ” and add from my gcode last lines