What got rid of a lot of smoke for me was cleaning the intake manifold. It's a bitch of a job...but I would say it can be done on a full Saturday
While you're at it, you can also delete the swirl flaps (requires drilling and taping the flap spindle holes)