2001 Volvo S40 P0107 and P0101

Engine Performance problem
2001 Volvo S40 4 cyl Two Wheel Drive Automatic

Hi. This is a 2001 Volvo S40 1.9L turbo. I've been having much less power on acceleration and engine roughness or stumbling accompanied with occasional stall and codes P0107 and P0101. I've already replaced the MAF and the MAP sensors and spark plugs. Before the codes would erase and come back later. Now they will not erase. Does the MAF need to be calibrated aka "reset MAF adaptations" at the dealer like Mercedes Benz? Any info solving this headache would be great.