remove the whole intake off the car. Get some brake cleaner.
Clean the egr, both sensors in the intake. I missed the MAP sensor, just done it today and my flatspot after changing gear has gone.
important things, engine filter just behind the injectors. fuel filter just in front of drivers rear...