30 is way way too low, but you already know that. Could be worth your while booking it into a Delphi specialist for a diagnosis.

Also, cleaning your MAF isn't always a great idea as it's very delicate. If you've damaged it it could account for your abysmal MPG>