Hi guys,
Need some help on this one
Not sure where to go from here

Vehicle sat for 3-5 years,
Vehicle initially had EGR code,
Vehicle had very dirty and stale fuel in it
And
P0171 system lean
P2195 o2 lean
Vehicle surges at idle
I’ve done :
an air filter
O2 sensor
New EGR since the last one leaked crazy
Cleaned out fuel rail
Cleaned & tested fuel injectors and replaced the parts in them
Fuel filter (it was so clogged with dirt and old fuel it, the fuel that came out of it was brown and had all kinds of particles in it)
Tank was drained of all remaining dirty fuel
New fuel was put in with gas treatment as well
Notes:
- have not tried MAF, however based on inspection of MAF and data seems to be okay
-Fuel pump does sound loud


After all was said and done after DTC were cleared
P2195 & p0171 came back and vehicle surged