Hasn't Marvel edited cigars, cigarettes, etc. out of some of their trades? Or did I imagine that?

You've imagined that, I think. They take them off the trades' front covers, but the actual issues inside are untouched.

-Jeph!

Just relax and enjoy the @#$% books.