Had a weird problem today, While coming to a stop my rpm needle dropped below .5 RPM's and the car stalled on me. I have always had a little bit of a rough idle (nothing too too bad, but noticable), but it seems to get worse sometimes. Also The car stalled on me when I used the brakes harder than normal. If I brake soft the needle is able to stay above .5RPM's. Also when I put the car from Park to Drive the needle almost dropped below .5 RPM's again.

I have a '98 A4 2.8 with tiptronic.

Could it be that I need to clean my MAF and Throttle Body?